add units to time, use configuration time api where appropriate, fixing Mantis #1875

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

diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index 445f99a6296fa8e560e39798ee78a6144d720c43..719acf07c6107e6e78b097f0eb16b76c4e247e47 100644 (file)
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -30,6 +30,10 @@
 #include "gnunet_os_lib.h"
 #include <gcrypt.h>
 
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
 /**
  * Create a cryptographically weak pseudo-random number in the interval of 0 to 1.
  *
@@ -209,7 +213,7 @@ entropy_generator (void *cls, const char *what, int printchar, int current,
     if (genproc != NULL)
     {
       if (0 != GNUNET_OS_process_kill (genproc, SIGTERM))
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "kill");
+        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill");
       GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc));
       GNUNET_OS_process_close (genproc);
       genproc = NULL;
@@ -227,13 +231,13 @@ entropy_generator (void *cls, const char *what, int printchar, int current,
       return;
     }
     if (0 != GNUNET_OS_process_kill (genproc, SIGTERM))
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "kill");
+      LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill");
     GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc));
     GNUNET_OS_process_close (genproc);
     genproc = NULL;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Starting `%s' process to generate entropy\n"), "find");
+  LOG (GNUNET_ERROR_TYPE_INFO, _("Starting `%s' process to generate entropy\n"),
+       "find");
   genproc =
       GNUNET_OS_start_process (NULL, NULL, "sh", "sh", "-c",
                                "exec find / -mount -type f -exec cp {} /dev/null \\; 2>/dev/null",
@@ -262,7 +266,7 @@ void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
              _
              ("libgcrypt has not the expected version (version %s is required).\n"),
              GCRYPT_VERSION);
-    abort ();
+    GNUNET_abort ();
   }
 #ifdef gcry_fast_random_poll
   gcry_fast_random_poll ();