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

[gnunet]

Author: grothoff
Date: 2009-10-05 04:31:29 -0600 (Mon, 05 Oct 2009)
New Revision: 9120

Modified:
   gnunet/src/util/os_installation.c
   gnunet/src/util/strings.c
Log:
bsdism

Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c   2009-10-05 10:26:04 UTC (rev 9119)
+++ gnunet/src/util/os_installation.c   2009-10-05 10:31:29 UTC (rev 9120)
@@ -314,6 +314,7 @@
 {
   char *ret;
 
+  ret = NULL;
 #if LINUX
   ret = get_path_from_proc_exe ();
   if (ret != NULL)
@@ -330,7 +331,7 @@
     return ret;
 #endif
   /* other attempts here */
-  return NULL;
+  return ret;
 }
 
 

Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c   2009-10-05 10:26:04 UTC (rev 9119)
+++ gnunet/src/util/strings.c   2009-10-05 10:31:29 UTC (rev 9120)
@@ -198,7 +198,13 @@
   tmp = GNUNET_malloc (tmpSize);
   itmp = tmp;
   finSize = tmpSize;
-  if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == (size_t) - 1)
+  if (iconv (cd, 
+#if FREEBSD
+            (const char **) &input, 
+#else
+            (char **) &input, 
+#endif
+            &len, &itmp, &finSize) == (size_t) - 1)
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "iconv");
       iconv_close (cd);