[GNUnet-SVN] r30004 - msh/src

[gnunet]

Author: harsha
Date: 2013-10-08 20:03:11 +0200 (Tue, 08 Oct 2013)
New Revision: 30004

Modified:
   msh/src/addressmap.c
   msh/src/msh.c
   msh/src/msh_waiter.c
   msh/src/mshd.c
   msh/src/test_pty.c
Log:
- fix warnings


Modified: msh/src/addressmap.c
===================================================================
--- msh/src/addressmap.c        2013-10-08 17:33:28 UTC (rev 30003)
+++ msh/src/addressmap.c        2013-10-08 18:03:11 UTC (rev 30004)
@@ -694,7 +694,6 @@
 addressmap_create_reverse_mapping (AddressMap *m)
 {
   struct ReverseAddressMap *rmap;
-  unsigned int cnt;
 
   rmap = GNUNET_malloc (sizeof (struct ReverseAddressMap));
   rmap->map = GNUNET_CONTAINER_multihashmap32_create (m->size * 3);  

Modified: msh/src/msh.c
===================================================================
--- msh/src/msh.c       2013-10-08 17:33:28 UTC (rev 30003)
+++ msh/src/msh.c       2013-10-08 18:03:11 UTC (rev 30004)
@@ -140,11 +140,6 @@
 static GNUNET_SCHEDULER_TaskIdentifier task_fwd_stdin;
 
 /**
- * Task to forward remote command output from MSHD to stdout
- */
-static GNUNET_SCHEDULER_TaskIdentifier task_fwd_stdout;
-
-/**
  * Shutdown task to disconnect client connections
  */
 static GNUNET_SCHEDULER_TaskIdentifier task_shutdown;
@@ -155,11 +150,6 @@
 static int result;
 
 /**
- * are we waiting for receiving something on connection conn
- */
-static int in_receive;
-
-/**
  * different states
  */
 enum State

Modified: msh/src/msh_waiter.c
===================================================================
--- msh/src/msh_waiter.c        2013-10-08 17:33:28 UTC (rev 30003)
+++ msh/src/msh_waiter.c        2013-10-08 18:03:11 UTC (rev 30004)
@@ -246,7 +246,6 @@
   uint16_t *ts;
   size_t size;
   unsigned int count;
-  int baud;
 
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;

Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c      2013-10-08 17:33:28 UTC (rev 30003)
+++ msh/src/mshd.c      2013-10-08 18:03:11 UTC (rev 30004)
@@ -204,11 +204,6 @@
 static GNUNET_SCHEDULER_TaskIdentifier finalise_task;
 
 /**
- * Task for waiting for a shutdown signal
- */
-static GNUNET_SCHEDULER_TaskIdentifier sigread_task;
-
-/**
  * Bitmap for checking which MPI processes have verified our addresses in the
  * current round
  */
@@ -235,11 +230,6 @@
 static char **run_args;
 
 /**
- * the process handle for the command to run
- */
-static struct GNUNET_OS_Process *process;
-
-/**
  * The path of the unix domain socket we use for communication with local MSH 
clients
  */
 static char *unixpath;
@@ -315,7 +305,6 @@
                              const struct sockaddr *netmask, 
                              socklen_t addrlen)
 {
-  char *hostip;
   in_addr_t ip;  
   const struct sockaddr_in *inaddr;
 
@@ -380,7 +369,6 @@
 {
   struct ReadContext *rctx;
   struct GNUNET_CONNECTION_Handle *conn;
-  int csock;
 
   atask = GNUNET_SCHEDULER_NO_TASK;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
@@ -438,7 +426,6 @@
 static void
 poll_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  MPI_Status status;
   int flag;
 
   poll_shutdown_task = GNUNET_SCHEDULER_NO_TASK;
@@ -771,8 +758,6 @@
 verify_addresses (struct InstanceAddrInfo *iainfo)
 {
   
-  struct InstanceAddr *iaddr;
-  
   bmx = 0;
   if (GNUNET_OK != instance_address_info_iterate_addresses (iainfo,
                                                             
&address_iterator_cb,
@@ -838,7 +823,6 @@
     int lb;
     int up;
     int source;
-    int ret;
 
     GNUNET_break (MPI_SUCCESS == 
                MPI_Probe (MPI_ANY_SOURCE, MSH_MTYPE_VERIFY_ADDRESSES, 
@@ -854,17 +838,30 @@
     up %= nproc;
     source = status.MPI_SOURCE;
     if (lb == up) 
+    {
       if (source != lb)
       {
         GNUNET_break (0);
         LOG_ERROR ("%d: Error: source %d; lb: %d; up: %d\n", rank, source, lb, 
up);
         goto err_ret;
       }
-    else if ((source > up) || (source < lb))
+    }
+    else if(lb < up)
     {
-      GNUNET_break (0);
-      goto err_ret;
+      if ((source < lb) || (source > up))
+      {
+        GNUNET_break (0);
+        goto err_ret;
+      }
     }
+    else if (up < lb)
+    {
+      if ((source > up) && (source < lb))
+      {
+        GNUNET_break (0);
+        goto err_ret;
+      }
+    }
     msg = GNUNET_malloc (rsize);
     if (MPI_SUCCESS != MPI_Recv (msg, rsize, MPI_BYTE, source,
                                  MSH_MTYPE_VERIFY_ADDRESSES, MPI_COMM_WORLD,
@@ -1066,7 +1063,6 @@
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  const struct GNUNET_DISK_FileHandle *fh;
   struct sockaddr_in addr;
   socklen_t addrlen;
   unsigned int cnt;
@@ -1136,7 +1132,6 @@
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
-  int c;
 
   ret = 1;
   rwidth = 1;

Modified: msh/src/test_pty.c
===================================================================
--- msh/src/test_pty.c  2013-10-08 17:33:28 UTC (rev 30003)
+++ msh/src/test_pty.c  2013-10-08 18:03:11 UTC (rev 30004)
@@ -152,7 +152,7 @@
   {
     LOG_ERROR ("Failure in connectivity\n");
     GNUNET_SCHEDULER_shutdown ();
-    return;
+    return 0;
   }
   GNUNET_assert (buf_off <= size);
   (void) memcpy (netbuf, buf, buf_off);
@@ -212,8 +212,6 @@
 child_died (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   const struct GNUNET_DISK_FileHandle *pr;
-  ssize_t rsize;
-  ssize_t wsize;
   char c[16];
 
   pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
@@ -613,9 +611,6 @@
                                 &do_shutdown, NULL);
   chld_argv = copy_argv (&args[argc]);
   return;
-
- err_ret:
-  GNUNET_break (0);
 }