commit b87e4e117595cb145b8f47e5a174c09f6dc5a3cd
author Qi Zhao <qi.zhao@cs.ucla.edu> Thu Mar 16 10:36:05 2017 -0700
committer Qi Zhao <qi.zhao@cs.ucla.edu> Thu Mar 16 10:42:49 2017 -0700
tree 3c65ecf6a21b76e5d3aec0ec2a16c34ab1a9df2d
parent 8d1a3a06b39396256b807aab1a194ed51eab2dc1

Few minor changes

- fix the bug of rib entry expiration period
- remove useless statements in StatusViewer

Change-Id: Iddcdadd436b95f33aade3e50773e5d868232fe0d

src/rib-status.cpp

diff --git a/src/rib-status.cpp b/src/rib-status.cpp
index 4a928d3..467f627 100644
--- a/src/rib-status.cpp
+++ b/src/rib-status.cpp
@@ -107,8 +107,8 @@
   for (auto const& ribEntry : status) {
     bool isSamePrefix = false;
     for (auto const& route : ribEntry.getRoutes()) {
-      QString expirationPeriod = route.hasExpirationPeriod() ? QString("Never") :
-                                 QString::fromStdString(std::to_string(route.getExpirationPeriod().count()));
+      QString expirationPeriod = route.hasExpirationPeriod() ?
+        QString::fromStdString(std::to_string(route.getExpirationPeriod().count())) : QString("Never");
       if (!isSamePrefix) {
         addItem(RibStatusItem(QString::fromStdString(ribEntry.getName().toUri()), route.getFaceId(), route.getOrigin(),
                               route.getCost(), route.isChildInherit(), route.isRibCapture(), expirationPeriod));

src/status-viewer.cpp

diff --git a/src/status-viewer.cpp b/src/status-viewer.cpp
index ea97b1b..6f36575 100644
--- a/src/status-viewer.cpp
+++ b/src/status-viewer.cpp
@@ -89,14 +89,11 @@
 StatusViewer::cancelEvents()
 {
   m_nextStatusRetrieval.cancel();
-  std::cerr << "Future events canceled" << std::endl;
 }
 
 void
 StatusViewer::requestNfdStatus()
 {
-  std::cerr << "requestNfdStatus" << std::endl;
-
   m_controller->fetch<ndn::nfd::ForwarderGeneralStatusDataset>(bind(&StatusViewer::onStatusRetrieved, this, _1),
                                                                bind(&StatusViewer::onStatusTimeout, this));
   m_controller->fetch<ndn::nfd::ChannelDataset>(bind(&StatusViewer::onChannelStatusRetrieved, this, _1),