commit f03d4796d73730a04d020c867f359cd2c60f3287
author Junxiao Shi <git@mail1.yoursunny.com> Thu Apr 06 16:41:22 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Apr 06 16:41:22 2017 +0000
tree 4d8bcd7544370880629a8fbbfd12558cae153871
parent 6fc57a69fa0ffde822b1dbfd774e7c27e2de5101

mgmt+tools: rename 'datas' to 'data'

Plural form of 'data' is 'data'.

refs #3955

Change-Id: I62f5ebe53b8e36d565e5a243288eb12ae9a08014

tools/nfdc/face-module.cpp

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}}";
 

tools/nfdc/forwarder-general-module.cpp

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";
 }