-LRN: fix socket_close logging

[oweals/gnunet.git] / src / util / pseudonym.c

diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index 85353c6da7fe801e3f4aa899767ee6c940c1420f..2a736bc4641aa32133d816b93c5e9d5303179e36 100644 (file)
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -31,6 +31,10 @@
 #include "gnunet_pseudonym_lib.h"
 #include "gnunet_bio_lib.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+
 /**
  * Name of the directory which stores meta data for pseudonym
  */
@@ -258,10 +262,9 @@ read_info (const struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   if (GNUNET_OK != GNUNET_BIO_read_close (fileR, &emsg))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _
-                ("Failed to parse metadata about pseudonym from file `%s': %s\n"),
-                fn, emsg);
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         _("Failed to parse metadata about pseudonym from file `%s': %s\n"), fn,
+         emsg);
     GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn));
     GNUNET_CONTAINER_meta_data_destroy (*meta);
     *meta = NULL;
@@ -356,7 +359,7 @@ GNUNET_PSEUDONYM_id_to_name (const struct GNUNET_CONFIGURATION_Handle *cfg,
     idx = i;
     if (sizeof (GNUNET_HashCode) !=
         GNUNET_DISK_file_write (fh, nsid, sizeof (GNUNET_HashCode)))
-      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "write", fn);
+      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "write", fn);
   }
   GNUNET_DISK_file_close (fh);
   ret = GNUNET_malloc (strlen (name) + 32);