[GNUnet-SVN] r11186 - in gnunet/src: fs transport

[gnunet]

Author: grothoff
Date: 2010-05-04 18:49:18 +0200 (Tue, 04 May 2010)
New Revision: 11186

Modified:
   gnunet/src/fs/fs.c
   gnunet/src/fs/fs_download.c
   gnunet/src/transport/plugin_transport_http.c
Log:
fixes

Modified: gnunet/src/fs/fs.c
===================================================================
--- gnunet/src/fs/fs.c  2010-05-04 15:48:39 UTC (rev 11185)
+++ gnunet/src/fs/fs.c  2010-05-04 16:49:18 UTC (rev 11186)
@@ -2440,6 +2440,7 @@
  cleanup:
   GNUNET_free_non_null (uris);
   GNUNET_free_non_null (dr);
+  GNUNET_free_non_null (emsg);
   free_download_context (dc);
 }
 
@@ -2567,7 +2568,6 @@
   char *ser;
   char *emsg;
   struct GNUNET_BIO_ReadHandle *rh;
-  struct GNUNET_FS_SearchContext *sc;
 
   ser = get_serialization_short_name (filename);
   rh = GNUNET_BIO_read_open (filename);
@@ -2580,7 +2580,7 @@
        }
       return GNUNET_OK;
     }
-  sc = deserialize_search (h, rh, NULL, ser);
+  (void) deserialize_search (h, rh, NULL, ser);
   GNUNET_free (ser);
   if (GNUNET_OK !=
       GNUNET_BIO_read_close (rh, &emsg))

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2010-05-04 15:48:39 UTC (rev 11185)
+++ gnunet/src/fs/fs_download.c 2010-05-04 16:49:18 UTC (rev 11186)
@@ -305,12 +305,10 @@
                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
   fh = NULL;
   if ( (dc->old_file_size > off) &&
-       (dc->filename != NULL) )
-    {
-      fh = GNUNET_DISK_file_open (dc->filename,
-                                 GNUNET_DISK_OPEN_READ,
-                                 GNUNET_DISK_PERM_NONE);
-    }
+       (dc->filename != NULL) )    
+    fh = GNUNET_DISK_file_open (dc->filename,
+                               GNUNET_DISK_OPEN_READ,
+                               GNUNET_DISK_PERM_NONE);    
   if ( (fh != NULL) &&
        (off  == 
        GNUNET_DISK_file_seek (fh,
@@ -358,6 +356,7 @@
            {
              GNUNET_break_op (0);
            }
+         GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
          return;
        }
     }

Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-05-04 15:48:39 UTC 
(rev 11185)
+++ gnunet/src/transport/plugin_transport_http.c        2010-05-04 16:49:18 UTC 
(rev 11186)
@@ -287,14 +287,16 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon has an incoming `%s' 
request from \n",method);
 
   if ( 0 == strcmp (MHD_HTTP_METHOD_PUT, method) )
-  {
-    /* PUT method here */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Got PUT Request with size %u 
\n",upload_data_size);
-
-    // GNUNET_STATISTICS_update( plugin->env->stats , gettext_noop("# PUT 
requests"), 1, GNUNET_NO);
-  }
+    {
+      /* PUT method here */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Got PUT Request with size %u 
\n",upload_data_size);
+      
+      // GNUNET_STATISTICS_update( plugin->env->stats , gettext_noop("# PUT 
requests"), 1, GNUNET_NO);
+    }
   if ( 0 == strcmp (MHD_HTTP_METHOD_GET, method) )
-
+    {
+      /* FIXME */
+    }
   return MHD_YES;
 }
 
@@ -346,6 +348,7 @@
                        _
                        ("Require valid port number for service `%s' in 
configuration!\n"),
                        "transport-http");
+      GNUNET_free (api);
       return NULL;
     }
   use_ipv6 = GNUNET_YES;