[GNUnet-SVN] r12783 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-09-01 01:26:18 +0200 (Wed, 01 Sep 2010)
New Revision: 12783

Modified:
   gnunet/src/util/test_resolver_api.c
   gnunet/src/util/test_strings.c
Log:
cleaner

Modified: gnunet/src/util/test_resolver_api.c
===================================================================
--- gnunet/src/util/test_resolver_api.c 2010-08-31 19:53:22 UTC (rev 12782)
+++ gnunet/src/util/test_resolver_api.c 2010-08-31 23:26:18 UTC (rev 12783)
@@ -254,7 +254,7 @@
    * DNS rootserver to test: a.root-servers.net - 198.41.0.4
    */
 
-  char const * rootserver_name = ROOTSERVER_NAME;
+  const char * rootserver_name = ROOTSERVER_NAME;
   struct hostent *rootserver;
 
   rootserver = gethostbyname(rootserver_name);

Modified: gnunet/src/util/test_strings.c
===================================================================
--- gnunet/src/util/test_strings.c      2010-08-31 19:53:22 UTC (rev 12782)
+++ gnunet/src/util/test_strings.c      2010-08-31 23:26:18 UTC (rev 12783)
@@ -37,6 +37,7 @@
   char *r;
   char *b;
   struct GNUNET_TIME_Absolute at;
+  const char *hdir;
 
   sprintf (buf, "4 %s", _( /* size unit */ "b"));
   b = GNUNET_STRINGS_byte_size_fancy (4);
@@ -65,16 +66,15 @@
                                             (GNUNET_TIME_UNIT_MILLISECONDS,
                                              7 * 60 * 60 * 1000));
   WANT (buf, b);
+#ifndef MINGW
+  hdir = getenv ("HOME");
+#else
+  hdir = getenv ("USERPROFILE");
+#endif
   GNUNET_snprintf (buf, 
                   sizeof (buf),
                   "%s%s",
-                  getenv (
-#ifndef MINGW
-                          "HOME"
-#else
-                          "USERPROFILE"
-#endif
-                          ),
+                  hdir,
                   DIR_SEPARATOR_STR);
   b = GNUNET_STRINGS_filename_expand ("~");
   WANT (buf, b);