commit 6fc750f7cb5cc9a04fb3cab8d87ebcc3436ac57f
author Davide Pesavento <davide.pesavento@lip6.fr> Tue Mar 18 19:49:39 2014 +0100
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Tue Mar 18 23:15:35 2014 -0700
tree 9f4ea8ee5dad026e307f59dd3c537ccfb0f87b14
parent eb3197fa353af1a28c573676072c868b52535bdf

tools: fix two warnings produced by gcc-4.8.

Change-Id: Ia27dd0b84b4a0e429f005ba4c0a5a5479dfc6769

tools/ndn-autoconfig.cpp

diff --git a/tools/ndn-autoconfig.cpp b/tools/ndn-autoconfig.cpp
index a62b7e7..1fb02b1 100644
--- a/tools/ndn-autoconfig.cpp
+++ b/tools/ndn-autoconfig.cpp
@@ -3,6 +3,7 @@
  * Copyright (C) 2014 Named Data Networking Project
  * See COPYING for copyright and distribution information.
  */
+
 #include <ndn-cpp-dev/face.hpp>
 #include <ndn-cpp-dev/management/nfd-controller.hpp>
 #include <ndn-cpp-dev/management/nfd-face-management-options.hpp>
@@ -38,7 +39,7 @@
     : ndn::nfd::Controller(face)
   {
   }
-      
+
   // Start to look for a hub (NDN hub discovery first stage)
   void
   discoverHubStage1()
@@ -227,10 +228,7 @@
       }
       
       blob += domainNameSize;
-      
-      rechdr* header = reinterpret_cast<rechdr*>(&blob[0]);
-      srv_t* server = reinterpret_cast<srv_t*>(&blob[sizeof(rechdr)]);
-      
+
       domainNameSize = dn_expand(queryAnswer.buf,
                                  queryAnswer.buf + answerSize,
                                  blob + 16,
@@ -240,6 +238,8 @@
       {
         return false;
       }
+
+      srv_t* server = reinterpret_cast<srv_t*>(&blob[sizeof(rechdr)]);
       uint16_t convertedPort = be16toh(server->port);
       std::string uri = "udp://";
       uri.append(hostName);

tools/ndn-tlv-peek.cpp

diff --git a/tools/ndn-tlv-peek.cpp b/tools/ndn-tlv-peek.cpp
index cb7adfd..f84116d 100644
--- a/tools/ndn-tlv-peek.cpp
+++ b/tools/ndn-tlv-peek.cpp
@@ -134,17 +134,16 @@
   void
   onData(const ndn::Interest& interest, ndn::Data& data)
   {
-    int returnValue;
     m_isDataReceived = true;
     if (m_isPayloadOnlySet)
       {
         ndn::Block block = data.getContent();
-        returnValue = write(1, block.value(), block.value_size());
+        write(1, block.value(), block.value_size());
       }
     else
       {
         ndn::Block block = data.wireEncode();
-        returnValue = write(1, block.wire(), block.size());
+        write(1, block.wire(), block.size());
       }
   }