[GNUnet-SVN] [gnunet] branch master updated (727f0d8a8 -> 03962e003)

[gnunet]

This is an automated email from the git hooks/post-receive script.

julius-buenger pushed a change to branch master
in repository gnunet.

    from 727f0d8a8 fix gns plugin action on NOTFOUND
     new 2b1b98147 Change cosmetics - keep compiler happy
     new c78aa8d4b Fix non-compiling code by proper pre-compiler usage
     new 03962e003 Fix signedness to keep compiler happy

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/rps/gnunet-rps-profiler.c | 8 ++++++--
 src/rps/gnunet-rps.c          | 6 ++++++
 src/rps/rps-test_util.c       | 4 ++--
 src/rps/rps_api.c             | 3 +++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index 073d26ffd..d2640225a 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -1821,6 +1821,7 @@ profiler_reply_handle (void *cls,
     tofile (file_name_dh,
              "%" PRIu32 "\n",
              (uint32_t) rcv_rps_peer->index);
+#ifdef TO_FILE
     to_file_raw (file_name_dhr,
                 (char *) &rcv_rps_peer->index,
                  sizeof (uint32_t));
@@ -1828,6 +1829,7 @@ profiler_reply_handle (void *cls,
                           (char *) &rcv_rps_peer->index,
                            sizeof (uint32_t),
                            bits_needed);
+#endif /* TO_FILE */
   }
   default_reply_handle (cls, n, recv_peers);
 }
@@ -1871,7 +1873,7 @@ profiler_cb (struct RPSPeer *rps_peer)
  *  #GNUNET_NO to stop iteration with no error,
  *  #GNUNET_SYSERR to abort iteration with error!
  */
-int
+static int
 file_name_cb (void *cls, const char *filename)
 {
   if (NULL != strstr (filename, "sampler_el"))
@@ -1903,14 +1905,16 @@ file_name_cb (void *cls, const char *filename)
  *
  * Compute all perfect samples.
  */
-int
+static int
 profiler_eval (void)
 {
+#ifdef TO_FILE
   /* Compute perfect sample for each sampler element */
   if (-1 == GNUNET_DISK_directory_scan ("/tmp/rps/", file_name_cb, NULL))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Scan of directory failed\n");
   }
+#endif /* TO_FILE */
 
   return evaluate ();
 }
diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c
index b3785a733..03b2c8ab7 100644
--- a/src/rps/gnunet-rps.c
+++ b/src/rps/gnunet-rps.c
@@ -63,6 +63,8 @@ static uint64_t num_view_updates;
 static void
 do_shutdown (void *cls)
 {
+  (void) cls;
+
   if (NULL != req_handle)
     GNUNET_RPS_request_cancel (req_handle);
   GNUNET_RPS_disconnect (rps_handle);
@@ -83,6 +85,7 @@ reply_handle (void *cls,
               const struct GNUNET_PeerIdentity *recv_peers)
 {
   uint64_t i;
+  (void) cls;
 
   req_handle = NULL;
   for (i = 0; i < n; i++)
@@ -108,6 +111,7 @@ view_update_handle (void *cls,
                     const struct GNUNET_PeerIdentity *recv_peers)
 {
   uint64_t i;
+  (void) cls;
 
   if (0 == n)
   {
@@ -148,6 +152,8 @@ run (void *cls,
 {
   static uint64_t num_peers;
   static struct GNUNET_PeerIdentity zero_pid;
+  (void) cls;
+  (void) cfgfile;
 
   rps_handle = GNUNET_RPS_connect (cfg);
   if (NULL == rps_handle)
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index 1a2db1427..ef39638bf 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -65,7 +65,7 @@ to_file_ (const char *file_name, char *line)
   char *output_buffer_p;
   //size_t size;
   int size;
-  size_t size2;
+  int size2;
 
 
   if (NULL == (f = GNUNET_DISK_file_open (file_name,
@@ -458,7 +458,7 @@ const char *
 store_prefix_file_name (const struct GNUNET_PeerIdentity *peer,
     const char *prefix)
 {
-  unsigned int len_file_name;
+  int len_file_name;
   int out_size;
   char *file_name;
   const char *pid_long;
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index ca80e25e8..ac462f3a0 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -158,6 +158,7 @@ resend_requests_iterator (void *cls, uint32_t key, void 
*value)
 {
   const struct GNUNET_RPS_Handle *h = cls;
   const struct GNUNET_RPS_Request_Handle *req_handle = value;
+  (void) key;
 
   send_request (h, req_handle->id, req_handle->num_peers);
   return GNUNET_YES; /* continue iterating */
@@ -195,6 +196,7 @@ check_reply (void *cls,
 {
   uint16_t msize = ntohs (msg->header.size);
   uint32_t num_peers = ntohl (msg->num_peers);
+  (void) cls;
 
   msize -= sizeof (struct GNUNET_RPS_CS_ReplyMessage);
   if ( (msize / sizeof (struct GNUNET_PeerIdentity) != num_peers) ||
@@ -289,6 +291,7 @@ check_view_update (void *cls,
 {
   uint16_t msize = ntohs (msg->header.size);
   uint32_t num_peers = ntohl (msg->num_peers);
+  (void) cls;
 
   msize -= sizeof (struct GNUNET_RPS_CS_DEBUG_ViewReply);
   if ( (msize / sizeof (struct GNUNET_PeerIdentity) != num_peers) ||

-- 
To stop receiving notification emails like this one, please contact
address@hidden