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

[gnunet]

Author: grothoff
Date: 2014-06-17 22:25:35 +0200 (Tue, 17 Jun 2014)
New Revision: 33720

Modified:
   gnunet/src/transport/gnunet-helper-transport-bluetooth.c
Log:
-handle case where sendsocket is still -1

Modified: gnunet/src/transport/gnunet-helper-transport-bluetooth.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-bluetooth.c    2014-06-17 
20:23:42 UTC (rev 33719)
+++ gnunet/src/transport/gnunet-helper-transport-bluetooth.c    2014-06-17 
20:25:35 UTC (rev 33720)
@@ -1948,13 +1948,13 @@
           fprintf (stderr, "LOG : %s sends a message to STDOUT\n", dev.iface); 
//FIXME: debugging message
 
         }
-        if (sendsocket != -1)
+        if (-1 != sendsocket)
         {
           if (FD_ISSET (sendsocket , &wfds))
           {
-            ssize_t ret =
-        write (sendsocket, write_pout.buf + write_std.pos,
-               write_pout.size - write_pout.pos);
+            ssize_t ret = write (sendsocket,
+                                 write_pout.buf + write_std.pos,
+                                 write_pout.size - write_pout.pos);
             if (0 > ret) //FIXME should I first check the error type?
             {
               fprintf (stderr, "Failed to write to bluetooth device: %s. 
Closing the socket!\n",
@@ -2101,7 +2101,8 @@
     stdin_mst = NULL;
     sdp_close (dev.session);
     (void) close (dev.fd_rfcomm);
-    (void) close (sendsocket);
+    if (-1 != sendsocket)
+      (void) close (sendsocket);
 
     for (i = 0; i < crt_rfds; i++)
       (void) close (rfds_list[i]);