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

[gnunet]

Author: grothoff
Date: 2012-12-21 12:31:23 +0100 (Fri, 21 Dec 2012)
New Revision: 25616

Modified:
   gnunet/src/transport/gnunet-service-transport_blacklist.c
Log:
-cleaner

Modified: gnunet/src/transport/gnunet-service-transport_blacklist.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_blacklist.c   2012-12-21 
11:01:19 UTC (rev 25615)
+++ gnunet/src/transport/gnunet-service-transport_blacklist.c   2012-12-21 
11:31:23 UTC (rev 25616)
@@ -234,11 +234,11 @@
                               "transport", "BLACKLIST_FILE");
     return;
   }
-  if ( (GNUNET_OK != GNUNET_DISK_file_test (fn)) &&
-       (GNUNET_OK != GNUNET_DISK_fn_write (fn, NULL, 0,
-                                          GNUNET_DISK_PERM_USER_READ |
-                                          GNUNET_DISK_PERM_USER_WRITE)) )
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "write", fn);
+  if (GNUNET_OK != GNUNET_DISK_file_test (fn))
+  {
+    GNUNET_free (fn);
+    return; /* no blacklist */
+  }
   if (GNUNET_OK != GNUNET_DISK_file_size (fn,
       &fsize, GNUNET_NO, GNUNET_YES))
   {
@@ -247,9 +247,9 @@
     GNUNET_free (fn);
     return;
   }
-  if (fsize == 0)
+  if (0 == fsize)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Blacklist file `%s' is empty.\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Blacklist file `%s' is empty.\n",
                 fn);
     GNUNET_free (fn);
     return;