add keywords from metadata for files

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

diff --git a/src/util/test_strings.c b/src/util/test_strings.c
index 0c7c56bcdc5654105ed99c03575c982663af3044..a1614b487dceaf827c3b1855d3444ed5a8cf2537 100644 (file)
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -37,42 +37,47 @@ check ()
   char *r;
   char *b;
   struct GNUNET_TIME_Absolute at;
   char *r;
   char *b;
   struct GNUNET_TIME_Absolute at;

+  const char *hdir;

 
 

-  sprintf (buf, "4%s", _( /* size unit */ "b"));
+  sprintf (buf, "4 %s", _( /* size unit */ "b"));

   b = GNUNET_STRINGS_byte_size_fancy (4);
   WANT (buf, b);
   b = GNUNET_STRINGS_byte_size_fancy (4);
   WANT (buf, b);

-  sprintf (buf, "10%s", _( /* size unit */ "KiB"));
+  sprintf (buf, "10 %s", _( /* size unit */ "KiB"));

   b = GNUNET_STRINGS_byte_size_fancy (10240);
   WANT (buf, b);
   b = GNUNET_STRINGS_byte_size_fancy (10240);
   WANT (buf, b);

-  sprintf (buf, "10%s", _( /* size unit */ "TiB"));
+  sprintf (buf, "10 %s", _( /* size unit */ "TiB"));

   b = GNUNET_STRINGS_byte_size_fancy (10240LL * 1024LL * 1024LL * 1024LL);
   WANT (buf, b);
   b = GNUNET_STRINGS_byte_size_fancy (10240LL * 1024LL * 1024LL * 1024LL);
   WANT (buf, b);

-  sprintf (buf, "4%s", _( /* time unit */ "ms"));
+  sprintf (buf, "4 %s", _( /* time unit */ "ms"));

   b =
     GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_relative_multiply
                                             (GNUNET_TIME_UNIT_MILLISECONDS,
                                              4));
   WANT (buf, b);
   b =
     GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_relative_multiply
                                             (GNUNET_TIME_UNIT_MILLISECONDS,
                                              4));
   WANT (buf, b);

-  sprintf (buf, "7%s", _( /* time unit */ "s"));
+  sprintf (buf, "7 %s", _( /* time unit */ "s"));

   b =
     GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_relative_multiply
                                             (GNUNET_TIME_UNIT_MILLISECONDS,
                                              7 * 1000));
   WANT (buf, b);
   b =
     GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_relative_multiply
                                             (GNUNET_TIME_UNIT_MILLISECONDS,
                                              7 * 1000));
   WANT (buf, b);

-  sprintf (buf, "7%s", _( /* time unit */ "h"));
+  sprintf (buf, "7 %s", _( /* time unit */ "h"));

   b =
     GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_relative_multiply
                                             (GNUNET_TIME_UNIT_MILLISECONDS,
                                              7 * 60 * 60 * 1000));
   WANT (buf, b);
   b =
     GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_relative_multiply
                                             (GNUNET_TIME_UNIT_MILLISECONDS,
                                              7 * 60 * 60 * 1000));
   WANT (buf, b);

-  sprintf (buf, "%s%s", getenv (

 #ifndef MINGW
 #ifndef MINGW

-      "HOME"
+  hdir = getenv ("HOME");

 #else
 #else

-      "USERPROFILE"
+  hdir = getenv ("USERPROFILE");

 #endif
 #endif

-)      , DIR_SEPARATOR_STR);
+  GNUNET_snprintf (buf, 
+                  sizeof (buf),
+                  "%s%s",
+                  hdir,
+                  DIR_SEPARATOR_STR);

   b = GNUNET_STRINGS_filename_expand ("~");
   b = GNUNET_STRINGS_filename_expand ("~");

+  GNUNET_assert (b != NULL);

   WANT (buf, b);
   GNUNET_STRINGS_buffer_fill (buf, sizeof (buf), 3, "a", "btx", "c");
   WANTB ("a\0btx\0c", buf, 8);
   WANT (buf, b);
   GNUNET_STRINGS_buffer_fill (buf, sizeof (buf), 3, "a", "btx", "c");
   WANTB ("a\0btx\0c", buf, 8);


@@ -84,7 +89,7 @@ check ()
   WANT ("btx", b);
   if (0 != GNUNET_STRINGS_buffer_tokenize (buf, 2, 2, &r, &b))
     return 1;
   WANT ("btx", b);
   if (0 != GNUNET_STRINGS_buffer_tokenize (buf, 2, 2, &r, &b))
     return 1;

-  at.value = 5000;
+  at.abs_value = 5000;

   r = GNUNET_STRINGS_absolute_time_to_string (at);
   /* r should be something like "Wed Dec 31 17:00:05 1969"
      where the details of the day and hour depend on the timezone;
   r = GNUNET_STRINGS_absolute_time_to_string (at);
   /* r should be something like "Wed Dec 31 17:00:05 1969"
      where the details of the day and hour depend on the timezone;