LRN's patch argument order

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

diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 188401abbc40de24d32a14a1d8f2aff2ea9609f8..a7a6ae915cee9881e1f742cdb88b2af3e7da9d28 100644 (file)
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -38,6 +38,10 @@
 #include <mach-o/dyld.h>
 #endif
 
+#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)
+
 #if LINUX
 /**
  * Try to determine path by reading /proc/PID/exe
@@ -57,9 +61,9 @@ get_path_from_proc_maps ()
     return NULL;
   while (NULL != fgets (line, sizeof (line), f))
   {
-    if ((1 == sscanf (line,
-                      "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%s",
-                      dir)) && (NULL != (lgu = strstr (dir, "libgnunetutil"))))
+    if ((1 ==
+         sscanf (line, "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%s", dir)) &&
+        (NULL != (lgu = strstr (dir, "libgnunetutil"))))
     {
       lgu[0] = '\0';
       fclose (f);
@@ -84,7 +88,7 @@ get_path_from_proc_exe ()
   size = readlink (fn, lnk, sizeof (lnk) - 1);
   if (size <= 0)
   {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
+    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
     return NULL;
   }
   GNUNET_assert (size < sizeof (lnk));
@@ -174,7 +178,7 @@ get_path_from_dyld_image ()
       path = _dyld_get_image_name (i);
       if (path != NULL && strlen (path) > 0)
       {
-        p = strdup (path);
+        p = GNUNET_strdup (path);
         s = p + strlen (p);
         while ((s > p) && (*s != '/'))
           s--;
@@ -247,7 +251,7 @@ get_path_from_GNUNET_PREFIX ()
   return NULL;
 }
 
-/*
+/**
  * @brief get the path to GNUnet bin/ or lib/, prefering the lib/ path
  * @author Milan
  *
@@ -286,10 +290,10 @@ os_get_gnunet_path ()
   if (ret != NULL)
     return ret;
   /* other attempts here */
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _
-              ("Could not determine installation path for %s.  Set `%s' environment variable.\n"),
-              "GNUnet", "GNUNET_PREFIX");
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       _
+       ("Could not determine installation path for %s.  Set `%s' environment variable.\n"),
+       "GNUnet", "GNUNET_PREFIX");
   return NULL;
 }
 
@@ -435,7 +439,7 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
  * PATH environment variable as a search path.
  *
  * @param binary the name of the file to check
- * @return GNUNET_YES if the file is SUID, 
+ * @return GNUNET_YES if the file is SUID,
  *         GNUNET_NO if not SUID (but binary exists)
  *         GNUNET_SYSERR on error (no such binary or not executable)
  */
@@ -470,14 +474,14 @@ GNUNET_OS_check_helper_binary (const char *binary)
 #endif
   if (p == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("Could not find binary `%s' in PATH!\n"), binary);
+    LOG (GNUNET_ERROR_TYPE_INFO, _("Could not find binary `%s' in PATH!\n"),
+         binary);
     return GNUNET_SYSERR;
   }
   if (0 != STAT (p, &statbuf))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("stat (%s) failed: %s\n"), p, STRERROR (errno));
+    LOG (GNUNET_ERROR_TYPE_WARNING, _("stat (%s) failed: %s\n"), p,
+         STRERROR (errno));
     GNUNET_free (p);
     return GNUNET_SYSERR;
   }
@@ -501,9 +505,8 @@ GNUNET_OS_check_helper_binary (const char *binary)
   {
     DWORD err = GetLastError ();
 
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) failed! GLE = %d\n",
-                err);
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) failed! GLE = %d\n", err);
     return GNUNET_NO;           /* not running as administrator */
   }
   closesocket (rawsock);