[GNUnet-SVN] r28697 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2013-08-19 09:47:56 +0200 (Mon, 19 Aug 2013)
New Revision: 28697

Modified:
   gnunet/src/transport/gnunet-helper-transport-wlan-dummy.c
   gnunet/src/transport/gnunet-helper-transport-wlan.c
   gnunet/src/transport/plugin_transport_http_common.c
   gnunet/src/transport/plugin_transport_http_server.c
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/plugin_transport_udp_broadcasting.c
   gnunet/src/transport/plugin_transport_unix.c
Log:
remove dead assignments


Modified: gnunet/src/transport/gnunet-helper-transport-wlan-dummy.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-wlan-dummy.c   2013-08-19 
07:33:50 UTC (rev 28696)
+++ gnunet/src/transport/gnunet-helper-transport-wlan-dummy.c   2013-08-19 
07:47:56 UTC (rev 28697)
@@ -263,7 +263,7 @@
     }
     if (NULL == (fpout = fopen (FIFO_FILE2, "w")))
     {
-      erg = mkfifo (FIFO_FILE2, 0666);
+      mkfifo (FIFO_FILE2, 0666);
       fpout = fopen (FIFO_FILE2, "w");
     }
     if (NULL == fpout)
@@ -277,7 +277,7 @@
     first = 0;
     if (NULL == (fpout = fopen (FIFO_FILE1, "w")))
     {
-      erg = mkfifo (FIFO_FILE1, 0666);
+      mkfifo (FIFO_FILE1, 0666);
       fpout = fopen (FIFO_FILE1, "w");
     }
     if (NULL == fpout)

Modified: gnunet/src/transport/gnunet-helper-transport-wlan.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-wlan.c 2013-08-19 07:33:50 UTC 
(rev 28696)
+++ gnunet/src/transport/gnunet-helper-transport-wlan.c 2013-08-19 07:47:56 UTC 
(rev 28697)
@@ -1482,7 +1482,7 @@
            if (PRISM_STATUS_OK == pv.status)
            {
              ri->ri_noise = pv.data;
-             got_noise = 1;
+             /* got_noise = 1; */
            }
            break;
          case PRISM_DID_RATE:
@@ -1504,7 +1504,7 @@
            if (PRISM_STATUS_OK == pv.status)
            {
              ri->ri_power = pv.data;
-             got_signal = 1;
+             /* got_signal = 1; */
            }
            break;
          }

Modified: gnunet/src/transport/plugin_transport_http_common.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.c 2013-08-19 07:33:50 UTC 
(rev 28696)
+++ gnunet/src/transport/plugin_transport_http_common.c 2013-08-19 07:47:56 UTC 
(rev 28697)
@@ -320,7 +320,6 @@
   address = NULL;
   plugin = NULL;
   optionstr = NULL;
-  options = 0;
   if ((NULL == addr) || (addrlen == 0))
   {
     GNUNET_break (0);
@@ -346,7 +345,7 @@
   }
   optionstr[0] = '\0';
   optionstr ++;
-  options = atol (optionstr);
+  options = atol (optionstr); /* 0 on conversion error, that's ok */
   address = strchr (optionstr, '.');
   if (NULL == address)
   {

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2013-08-19 07:33:50 UTC 
(rev 28696)
+++ gnunet/src/transport/plugin_transport_http_server.c 2013-08-19 07:47:56 UTC 
(rev 28697)
@@ -1424,7 +1424,7 @@
     response = MHD_create_response_from_data (strlen ("Thank you!"),
                                        "Thank you!",
                                        MHD_NO, MHD_NO);
-    res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+    MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
     MHD_destroy_response (response);
     return MHD_YES;
   }
@@ -1472,7 +1472,7 @@
       response = MHD_create_response_from_data (strlen ("Thank you!"),
                                          "Thank you!",
                                          MHD_NO, MHD_NO);
-      res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+      MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
       MHD_destroy_response (response);
       return MHD_YES;
     }

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2013-08-19 07:33:50 UTC (rev 
28696)
+++ gnunet/src/transport/plugin_transport_tcp.c 2013-08-19 07:47:56 UTC (rev 
28697)
@@ -597,7 +597,6 @@
   uint16_t port;
   uint32_t options;
 
-  options = 0;
   switch (addrlen)
   {
   case sizeof (struct IPv6TcpAddress):
@@ -665,7 +664,6 @@
   address = NULL;
   plugin = NULL;
   optionstr = NULL;
-  options = 0;
   if ((NULL == addr) || (addrlen == 0))
   {
     GNUNET_break (0);
@@ -1735,8 +1733,6 @@
   uint16_t port;
   uint32_t options;
 
-
-  options = 0;
   if (addrlen == sizeof (struct IPv6TcpAddress))
   {
     t6 = addr;

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-08-19 07:33:50 UTC (rev 
28696)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-08-19 07:47:56 UTC (rev 
28697)
@@ -559,7 +559,6 @@
   uint16_t port;
   uint32_t options;
 
-  options = 0;
   if (addrlen == sizeof (struct IPv6UdpAddress))
   {
     t6 = addr;
@@ -622,7 +621,7 @@
   address = NULL;
   plugin = NULL;
   optionstr = NULL;
-  options = 0;
+
   if ((NULL == addr) || (addrlen == 0))
   {
     GNUNET_break (0);
@@ -795,7 +794,6 @@
   uint16_t port;
   uint32_t options;
 
-  options = 0;
   if (addrlen == sizeof (struct IPv6UdpAddress))
   {
     u6 = addr;
@@ -1256,7 +1254,6 @@
       call_continuation(udpw, GNUNET_SYSERR);
       GNUNET_free (udpw);
     }
-    udpw = next;
   }
   plugin->env->session_end (plugin->env->cls, &s->target, s);
 

Modified: gnunet/src/transport/plugin_transport_udp_broadcasting.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp_broadcasting.c    2013-08-19 
07:33:50 UTC (rev 28696)
+++ gnunet/src/transport/plugin_transport_udp_broadcasting.c    2013-08-19 
07:47:56 UTC (rev 28697)
@@ -272,7 +272,7 @@
   plugin->send_ipv4_broadcast_task = GNUNET_SCHEDULER_NO_TASK;
 
   msg_size = prepare_beacon(plugin, (struct UDP_Beacon_Message *) &buf);
-  sent = 0;
+
   baddr = plugin->ipv4_broadcast_head;
   /* just IPv4 */
   while ((msg_size > 0) && (baddr != NULL) && (baddr->addrlen == sizeof 
(struct sockaddr_in)))
@@ -324,7 +324,6 @@
   plugin->send_ipv6_broadcast_task = GNUNET_SCHEDULER_NO_TASK;
 
   msg_size = prepare_beacon(plugin, (struct UDP_Beacon_Message *) &buf);
-  sent = 0;
   sent = GNUNET_NETWORK_socket_sendto (plugin->sockv6, &buf, msg_size,
                                     (const struct sockaddr *)
                                     &plugin->ipv6_multicast_address,

Modified: gnunet/src/transport/plugin_transport_unix.c
===================================================================
--- gnunet/src/transport/plugin_transport_unix.c        2013-08-19 07:33:50 UTC 
(rev 28696)
+++ gnunet/src/transport/plugin_transport_unix.c        2013-08-19 07:47:56 UTC 
(rev 28697)
@@ -610,7 +610,6 @@
 
 resend:
   /* Send the data */
-  sent = 0;
   sent = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size, sb, 
sbs);
 
   if (GNUNET_SYSERR == sent)
@@ -1440,7 +1439,7 @@
   address = NULL;
   plugin = NULL;
   optionstr = NULL;
-  options = 0;
+
   if ((NULL == addr) || (addrlen == 0))
   {
     GNUNET_break (0);