mgmt+tools: rename 'datas' to 'data'
Plural form of 'data' is 'data'.
refs #3955
Change-Id: I62f5ebe53b8e36d565e5a243288eb12ae9a08014
diff --git a/tools/nfd-status-http-server-files/nfd-status.xsl b/tools/nfd-status-http-server-files/nfd-status.xsl
index ff92dae..92a0488 100644
--- a/tools/nfd-status-http-server-files/nfd-status.xsl
+++ b/tools/nfd-status-http-server-files/nfd-status.xsl
@@ -105,8 +105,8 @@
<td><xsl:value-of select="nfd:nCsEntries"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nInterests"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nInterests"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nDatas"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nDatas"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nData"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nData"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nNacks"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nNacks"/></td>
</tr>
@@ -198,11 +198,11 @@
</xsl:choose>
</td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nInterests"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nDatas"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nData"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:incomingPackets/nfd:nNacks"/></td>
<td><xsl:value-of select="nfd:byteCounters/nfd:incomingBytes"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nInterests"/></td>
- <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nDatas"/></td>
+ <td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nData"/></td>
<td><xsl:value-of select="nfd:packetCounters/nfd:outgoingPackets/nfd:nNacks"/></td>
<td><xsl:value-of select="nfd:byteCounters/nfd:outgoingBytes"/></td>
</tr>
diff --git a/tools/nfdc/face-module.cpp b/tools/nfdc/face-module.cpp
index 2ec3719..857956e 100644
--- a/tools/nfdc/face-module.cpp
+++ b/tools/nfdc/face-module.cpp
@@ -333,12 +333,12 @@
os << "<packetCounters>";
os << "<incomingPackets>"
<< "<nInterests>" << item.getNInInterests() << "</nInterests>"
- << "<nDatas>" << item.getNInDatas() << "</nDatas>"
+ << "<nData>" << item.getNInData() << "</nData>"
<< "<nNacks>" << item.getNInNacks() << "</nNacks>"
<< "</incomingPackets>";
os << "<outgoingPackets>"
<< "<nInterests>" << item.getNOutInterests() << "</nInterests>"
- << "<nDatas>" << item.getNOutDatas() << "</nDatas>"
+ << "<nData>" << item.getNOutData() << "</nData>"
<< "<nNacks>" << item.getNOutNacks() << "</nNacks>"
<< "</outgoingPackets>";
os << "</packetCounters>";
@@ -378,12 +378,12 @@
os << ia("counters")
<< "{in={"
<< item.getNInInterests() << "i "
- << item.getNInDatas() << "d "
+ << item.getNInData() << "d "
<< item.getNInNacks() << "n "
<< item.getNInBytes() << "B} "
<< "out={"
<< item.getNOutInterests() << "i "
- << item.getNOutDatas() << "d "
+ << item.getNOutData() << "d "
<< item.getNOutNacks() << "n "
<< item.getNOutBytes() << "B}}";
diff --git a/tools/nfdc/forwarder-general-module.cpp b/tools/nfdc/forwarder-general-module.cpp
index dc12e96..ee3e0af 100644
--- a/tools/nfdc/forwarder-general-module.cpp
+++ b/tools/nfdc/forwarder-general-module.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -93,12 +93,12 @@
os << "<packetCounters>";
os << "<incomingPackets>"
<< "<nInterests>" << item.getNInInterests() << "</nInterests>"
- << "<nDatas>" << item.getNInDatas() << "</nDatas>"
+ << "<nData>" << item.getNInData() << "</nData>"
<< "<nNacks>" << item.getNInNacks() << "</nNacks>"
<< "</incomingPackets>";
os << "<outgoingPackets>"
<< "<nInterests>" << item.getNOutInterests() << "</nInterests>"
- << "<nDatas>" << item.getNOutDatas() << "</nDatas>"
+ << "<nData>" << item.getNOutData() << "</nData>"
<< "<nNacks>" << item.getNOutNacks() << "</nNacks>"
<< "</outgoingPackets>";
os << "</packetCounters>";
@@ -131,8 +131,8 @@
os << " nInInterests=" << item.getNInInterests() << "\n";
os << " nOutInterests=" << item.getNOutInterests() << "\n";
- os << " nInDatas=" << item.getNInDatas() << "\n";
- os << " nOutDatas=" << item.getNOutDatas() << "\n";
+ os << " nInData=" << item.getNInData() << "\n";
+ os << " nOutData=" << item.getNOutData() << "\n";
os << " nInNacks=" << item.getNInNacks() << "\n";
os << " nOutNacks=" << item.getNOutNacks() << "\n";
}