[GNUnet-SVN] r28439 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2013-08-07 16:36:50 +0200 (Wed, 07 Aug 2013)
New Revision: 28439

Modified:
   gnunet/src/fs/fs_namespace.c
Log:
-fix W32 FTBFS

Modified: gnunet/src/fs/fs_namespace.c
===================================================================
--- gnunet/src/fs/fs_namespace.c        2013-08-07 13:56:40 UTC (rev 28438)
+++ gnunet/src/fs/fs_namespace.c        2013-08-07 14:36:50 UTC (rev 28439)
@@ -268,19 +268,15 @@
   if (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &count))
   {
     GNUNET_break (0);
-    goto ERROR;
+    goto END;
   }
   if (count > 1024 * 1024)
   {
     GNUNET_break (0);
-    goto ERROR;
+    goto END;
   }
   if (0 == count)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
-    GNUNET_free (fn);
-    return uig;
-  }
+    goto END;
   uig->update_nodes =
     GNUNET_malloc (count * sizeof (struct NamespaceUpdateNode *));
 
@@ -316,20 +312,13 @@
     uig->update_nodes[i] = n;
   }
   uig->update_node_count = i;
+ END:
   if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to read `%s': %s\n"), 
                fn, emsg);
     GNUNET_free (emsg);
   }
-  return uig;
-ERROR:
-  if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to read `%s': %s\n"), 
-               fn, emsg);
-    GNUNET_free (emsg);
-  }
   GNUNET_free (fn);
   return uig;
 }