1 files changed, 148 insertions, 143 deletions

diff --git a/src/util/strings.c b/src/util/strings.c
index e2ca69e10..9e9aac3b1 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -32,6 +32,10 @@
 #include "gnunet_common.h"
 #include "gnunet_strings_lib.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
 
 /**
  * Fill a buffer of the given size with
@@ -55,7 +59,8 @@
  *         (or number of bytes that would have been written)
  */
 size_t
-GNUNET_STRINGS_buffer_fill (char *buffer, size_t size, unsigned int count, ...)
+GNUNET_STRINGS_buffer_fill (char *buffer, size_t size, unsigned int count,
+                            ...)
 {
   size_t needed;
   size_t slen;
@@ -65,18 +70,18 @@ GNUNET_STRINGS_buffer_fill (char *buffer, size_t size, unsigned int count, ...)
   needed = 0;
   va_start (ap, count);
   while (count > 0)
-  {
-    s = va_arg (ap, const char *);
-
-    slen = strlen (s) + 1;
-    if (buffer != NULL)
     {
-      GNUNET_assert (needed + slen <= size);
-      memcpy (&buffer[needed], s, slen);
+      s = va_arg (ap, const char *);
+
+      slen = strlen (s) + 1;
+      if (buffer != NULL)
+        {
+          GNUNET_assert (needed + slen <= size);
+          memcpy (&buffer[needed], s, slen);
+        }
+      needed += slen;
+      count--;
     }
-    needed += slen;
-    count--;
-  }
   va_end (ap);
   return needed;
 }
@@ -97,7 +102,7 @@ GNUNET_STRINGS_buffer_fill (char *buffer, size_t size, unsigned int count, ...)
  */
 unsigned int
 GNUNET_STRINGS_buffer_tokenize (const char *buffer, size_t size,
-                                unsigned int count, ...)
+                                unsigned int count, ...)
 {
   unsigned int start;
   unsigned int needed;
@@ -107,21 +112,21 @@ GNUNET_STRINGS_buffer_tokenize (const char *buffer, size_t size,
   needed = 0;
   va_start (ap, count);
   while (count > 0)
-  {
-    r = va_arg (ap, const char **);
-
-    start = needed;
-    while ((needed < size) && (buffer[needed] != '\0'))
-      needed++;
-    if (needed == size)
     {
-      va_end (ap);
-      return 0;                 /* error */
+      r = va_arg (ap, const char **);
+
+      start = needed;
+      while ((needed < size) && (buffer[needed] != '\0'))
+        needed++;
+      if (needed == size)
+        {
+          va_end (ap);
+          return 0;             /* error */
+        }
+      *r = &buffer[start];
+      needed++;                 /* skip 0-termination */
+      count--;
     }
-    *r = &buffer[start];
-    needed++;                   /* skip 0-termination */
-    count--;
-  }
   va_end (ap);
   return needed;
 }
@@ -140,25 +145,25 @@ GNUNET_STRINGS_byte_size_fancy (unsigned long long size)
   char *ret;
 
   if (size > 5 * 1024)
-  {
-    size = size / 1024;
-    unit = _( /* size unit */ "KiB");
-    if (size > 5 * 1024)
     {
       size = size / 1024;
-      unit = _( /* size unit */ "MiB");
+      unit = _( /* size unit */ "KiB");
       if (size > 5 * 1024)
-      {
-        size = size / 1024;
-        unit = _( /* size unit */ "GiB");
-        if (size > 5 * 1024)
-        {
-          size = size / 1024;
-          unit = _( /* size unit */ "TiB");
-        }
-      }
+        {
+          size = size / 1024;
+          unit = _( /* size unit */ "MiB");
+          if (size > 5 * 1024)
+            {
+              size = size / 1024;
+              unit = _( /* size unit */ "GiB");
+              if (size > 5 * 1024)
+                {
+                  size = size / 1024;
+                  unit = _( /* size unit */ "TiB");
+                }
+            }
+        }
     }
-  }
   ret = GNUNET_malloc (32);
   GNUNET_snprintf (ret, 32, "%llu %s", size, unit);
   return ret;
@@ -187,41 +192,41 @@ GNUNET_STRINGS_to_utf8 (const char *input, size_t len, const char *charset)
 
   cd = iconv_open ("UTF-8", charset);
   if (cd == (iconv_t) - 1)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "iconv_open");
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Character set requested was `%s'\n"), charset);
-    ret = GNUNET_malloc (len + 1);
-    memcpy (ret, input, len);
-    ret[len] = '\0';
-    return ret;
-  }
+    {
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "iconv_open");
+      LOG (GNUNET_ERROR_TYPE_WARNING,
+           _("Character set requested was `%s'\n"), charset);
+      ret = GNUNET_malloc (len + 1);
+      memcpy (ret, input, len);
+      ret[len] = '\0';
+      return ret;
+    }
   tmpSize = 3 * len + 4;
   tmp = GNUNET_malloc (tmpSize);
   itmp = tmp;
   finSize = tmpSize;
   if (iconv (cd,
 #if FREEBSD || DARWIN || WINDOWS
-             (const char **) &input,
+             (const char **) &input,
 #else
-             (char **) &input,
+             (char **) &input,
 #endif
-             &len, &itmp, &finSize) == SIZE_MAX)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "iconv");
-    iconv_close (cd);
-    GNUNET_free (tmp);
-    ret = GNUNET_malloc (len + 1);
-    memcpy (ret, input, len);
-    ret[len] = '\0';
-    return ret;
-  }
+             &len, &itmp, &finSize) == SIZE_MAX)
+    {
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "iconv");
+      iconv_close (cd);
+      GNUNET_free (tmp);
+      ret = GNUNET_malloc (len + 1);
+      memcpy (ret, input, len);
+      ret[len] = '\0';
+      return ret;
+    }
   ret = GNUNET_malloc (tmpSize - finSize + 1);
   memcpy (ret, tmp, tmpSize - finSize);
   ret[tmpSize - finSize] = '\0';
   GNUNET_free (tmp);
   if (0 != iconv_close (cd))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "iconv_close");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "iconv_close");
   return ret;
 #else
   ret = GNUNET_malloc (len + 1);
@@ -262,89 +267,89 @@ GNUNET_STRINGS_filename_expand (const char *fil)
     /* absolute path, just copy */
     return GNUNET_strdup (fil);
   if (fil[0] == '~')
-  {
-    fm = getenv ("HOME");
-    if (fm == NULL)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _
-                  ("Failed to expand `$HOME': environment variable `HOME' not set"));
-      return NULL;
+      fm = getenv ("HOME");
+      if (fm == NULL)
+        {
+          LOG (GNUNET_ERROR_TYPE_WARNING,
+               _
+               ("Failed to expand `$HOME': environment variable `HOME' not set"));
+          return NULL;
+        }
+      fm = GNUNET_strdup (fm);
+      /* do not copy '~' */
+      fil_ptr = fil + 1;
+
+      /* skip over dir seperator to be consistent */
+      if (fil_ptr[0] == DIR_SEPARATOR)
+        fil_ptr++;
     }
-    fm = GNUNET_strdup (fm);
-    /* do not copy '~' */
-    fil_ptr = fil + 1;
-
-    /* skip over dir seperator to be consistent */
-    if (fil_ptr[0] == DIR_SEPARATOR)
-      fil_ptr++;
-  }
   else
-  {
-    /* relative path */
-    fil_ptr = fil;
-    len = 512;
-    fm = NULL;
-    while (1)
     {
-      buffer = GNUNET_malloc (len);
-      if (getcwd (buffer, len) != NULL)
-      {
-        fm = buffer;
-        break;
-      }
-      if ((errno == ERANGE) && (len < 1024 * 1024 * 4))
-      {
-        len *= 2;
-        GNUNET_free (buffer);
-        continue;
-      }
-      GNUNET_free (buffer);
-      break;
+      /* relative path */
+      fil_ptr = fil;
+      len = 512;
+      fm = NULL;
+      while (1)
+        {
+          buffer = GNUNET_malloc (len);
+          if (getcwd (buffer, len) != NULL)
+            {
+              fm = buffer;
+              break;
+            }
+          if ((errno == ERANGE) && (len < 1024 * 1024 * 4))
+            {
+              len *= 2;
+              GNUNET_free (buffer);
+              continue;
+            }
+          GNUNET_free (buffer);
+          break;
+        }
+      if (fm == NULL)
+        {
+          LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "getcwd");
+          buffer = getenv ("PWD");      /* alternative */
+          if (buffer != NULL)
+            fm = GNUNET_strdup (buffer);
+        }
+      if (fm == NULL)
+        fm = GNUNET_strdup ("./");      /* give up */
     }
-    if (fm == NULL)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "getcwd");
-      buffer = getenv ("PWD");  /* alternative */
-      if (buffer != NULL)
-        fm = GNUNET_strdup (buffer);
-    }
-    if (fm == NULL)
-      fm = GNUNET_strdup ("./");        /* give up */
-  }
   n = strlen (fm) + 1 + strlen (fil_ptr) + 1;
   buffer = GNUNET_malloc (n);
   GNUNET_snprintf (buffer, n, "%s%s%s", fm,
-                   (fm[strlen (fm) - 1] ==
-                    DIR_SEPARATOR) ? "" : DIR_SEPARATOR_STR, fil_ptr);
+                   (fm[strlen (fm) - 1] ==
+                    DIR_SEPARATOR) ? "" : DIR_SEPARATOR_STR, fil_ptr);
   GNUNET_free (fm);
   return buffer;
 #else
   fn = GNUNET_malloc (MAX_PATH + 1);
 
   if ((lRet = plibc_conv_to_win_path (fil, fn)) != ERROR_SUCCESS)
-  {
-    SetErrnoFromWinError (lRet);
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "plibc_conv_to_win_path");
-    return NULL;
-  }
+    {
+      SetErrnoFromWinError (lRet);
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "plibc_conv_to_win_path");
+      return NULL;
+    }
   /* is the path relative? */
   if ((strncmp (fn + 1, ":\\", 2) != 0) && (strncmp (fn, "\\\\", 2) != 0))
-  {
-    char szCurDir[MAX_PATH + 1];
-
-    lRet = GetCurrentDirectory (MAX_PATH + 1, szCurDir);
-    if (lRet + strlen (fn) + 1 > (MAX_PATH + 1))
     {
-      SetErrnoFromWinError (ERROR_BUFFER_OVERFLOW);
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "GetCurrentDirectory");
-      return NULL;
+      char szCurDir[MAX_PATH + 1];
+
+      lRet = GetCurrentDirectory (MAX_PATH + 1, szCurDir);
+      if (lRet + strlen (fn) + 1 > (MAX_PATH + 1))
+        {
+          SetErrnoFromWinError (ERROR_BUFFER_OVERFLOW);
+          LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "GetCurrentDirectory");
+          return NULL;
+        }
+      buffer = GNUNET_malloc (MAX_PATH + 1);
+      GNUNET_snprintf (buffer, MAX_PATH + 1, "%s\\%s", szCurDir, fn);
+      GNUNET_free (fn);
+      fn = buffer;
     }
-    buffer = GNUNET_malloc (MAX_PATH + 1);
-    GNUNET_snprintf (buffer, MAX_PATH + 1, "%s\\%s", szCurDir, fn);
-    GNUNET_free (fn);
-    fn = buffer;
-  }
 
   return fn;
 #endif
@@ -367,25 +372,25 @@ GNUNET_STRINGS_relative_time_to_string (struct GNUNET_TIME_Relative delta)
   if (delta.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
     return GNUNET_strdup (_("eternity"));
   if (dval > 5 * 1000)
-  {
-    dval = dval / 1000;
-    unit = _( /* time unit */ "s");
-    if (dval > 5 * 60)
     {
-      dval = dval / 60;
-      unit = _( /* time unit */ "m");
+      dval = dval / 1000;
+      unit = _( /* time unit */ "s");
       if (dval > 5 * 60)
-      {
-        dval = dval / 60;
-        unit = _( /* time unit */ "h");
-        if (dval > 5 * 24)
-        {
-          dval = dval / 24;
-          unit = _( /* time unit */ " days");
-        }
-      }
+        {
+          dval = dval / 60;
+          unit = _( /* time unit */ "m");
+          if (dval > 5 * 60)
+            {
+              dval = dval / 60;
+              unit = _( /* time unit */ "h");
+              if (dval > 5 * 24)
+                {
+                  dval = dval / 24;
+                  unit = _( /* time unit */ " days");
+                }
+            }
+        }
     }
-  }
   GNUNET_asprintf (&ret, "%llu %s", dval, unit);
   return ret;
 }