[GNUnet-SVN] r2387 - in GNUnet/src/applications: fs/fsui fs/module fs/tools testbed

[grothoff]

Author: grothoff
Date: 2005-12-23 13:14:33 -0800 (Fri, 23 Dec 2005)
New Revision: 2387

Modified:
   GNUnet/src/applications/fs/fsui/download.c
   GNUnet/src/applications/fs/module/ondemand.c
   GNUnet/src/applications/fs/tools/gnunet-search.c
   GNUnet/src/applications/testbed/commands.c
Log:
fixing more warnings

Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c  2005-12-23 21:11:34 UTC (rev 
2386)
+++ GNUnet/src/applications/fs/fsui/download.c  2005-12-23 21:14:33 UTC (rev 
2387)
@@ -85,11 +85,11 @@
                    + strlen(filename));
   strcpy(fullName, parent->filename);
   strcat(fullName, GNUNET_DIRECTORY_EXT);
-  while(dotdot = strstr(fullName, ".."))
+  while (NULL != (dotdot = strstr(fullName, "..")))
     dotdot[0] = dotdot[1] = '_';
   mkdirp(fullName);
   strcat(fullName, DIR_SEPARATOR_STR);
-  while(dotdot = strstr(filename, ".."))
+  while (NULL != (dotdot = strstr(filename, "..")))
     dotdot[0] = dotdot[1] = '_';
   strcat(fullName, filename);
   FREE(filename);

Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c        2005-12-23 21:11:34 UTC 
(rev 2386)
+++ GNUnet/src/applications/fs/module/ondemand.c        2005-12-23 21:14:33 UTC 
(rev 2387)
@@ -666,10 +666,12 @@
   index_directory = expandFileName(tmp);
   FREE(tmp);
   mkdirp(index_directory); /* just in case */  
+  return OK;
 }
 
 int ONDEMAND_done() {
   FREE(index_directory);
+  return OK;
 }
 
 /* end of ondemand.c */

Modified: GNUnet/src/applications/fs/tools/gnunet-search.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-search.c    2005-12-23 21:11:34 UTC 
(rev 2386)
+++ GNUnet/src/applications/fs/tools/gnunet-search.c    2005-12-23 21:14:33 UTC 
(rev 2387)
@@ -78,7 +78,7 @@
   if (filename != NULL) {
     char *dotdot;
     
-    while(dotdot = strstr(filename, ".."))
+    while (NULL != (dotdot = strstr(filename, "..")))
       dotdot[0] = dotdot[1] = '_';
     
     printf("gnunet-download -o \"%s\" %s\n",

Modified: GNUnet/src/applications/testbed/commands.c
===================================================================
--- GNUnet/src/applications/testbed/commands.c  2005-12-23 21:11:34 UTC (rev 
2386)
+++ GNUnet/src/applications/testbed/commands.c  2005-12-23 21:14:33 UTC (rev 
2387)
@@ -960,7 +960,7 @@
                        &pid))
     return -1;
   if (OK != readResult(dst,
-                      &ack))
+                      (int*) &ack))
     return -1;
   if (ack != SYSERR) {
     char * tmp;