[GNUnet-SVN] r1659 - in GNUnet/src: applications/sqstore_sqlite conf util

[grothoff]

Author: grothoff
Date: 2005-08-13 20:24:42 -0700 (Sat, 13 Aug 2005)
New Revision: 1659

Modified:
   GNUnet/src/applications/sqstore_sqlite/sqlite.c
   GNUnet/src/conf/confdata.c
   GNUnet/src/util/configuration.c
Log:
warnings

Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c     2005-08-14 03:16:58 UTC 
(rev 1658)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c     2005-08-14 03:24:42 UTC 
(rev 1659)
@@ -83,22 +83,22 @@
  * @brief Returns the storage needed for the specfied int
  */
 static unsigned int getIntSize(unsigned long long l) {
-       if (l & 0x7FFFFFFFFFFF == l)
-               if (l & 0x7FFFFFFF == l)
-                       if (l & 0x7FFFFF == l)
-                               if (l & 0x7FFF == l)
-                                       if (l & 0x7F == l)
-                                               return 1;
-                                       else
-                                               return 2;
-                               else
-                                       return 3;
-                       else
-                               return 4;
-               else
-                       return 6;
+  if ((l & 0x7FFFFFFFFFFFLL) == l)
+    if ((l & 0x7FFFFFFF) == l)
+      if ((l & 0x7FFFFF) == l)
+       if ((l & 0x7FFF) == l)
+         if ((l & 0x7F) == l)
+           return 1;
+         else
+           return 2;
        else
-               return 8;
+         return 3;
+      else
+       return 4;
+    else
+      return 6;
+  else
+    return 8;
 }
 
 

Modified: GNUnet/src/conf/confdata.c
===================================================================
--- GNUnet/src/conf/confdata.c  2005-08-14 03:16:58 UTC (rev 1658)
+++ GNUnet/src/conf/confdata.c  2005-08-14 03:24:42 UTC (rev 1659)
@@ -124,11 +124,11 @@
 /**
  * @brief Set default for GNUNETD_HOME if needed
  */
-void checkGNUNETDHome(const struct symbol *sym)
+void checkGNUNETDHome(struct symbol *sym)
 {
        if (strcmp(sym->name, "GNUNETD_HOME") == 0)
        {
-               char *val;
+               const char *val;
                
                sym_calc_value_ext(sym, 1);
                val = sym_get_string_value(sym);

Modified: GNUnet/src/util/configuration.c
===================================================================
--- GNUnet/src/util/configuration.c     2005-08-14 03:16:58 UTC (rev 1658)
+++ GNUnet/src/util/configuration.c     2005-08-14 03:24:42 UTC (rev 1659)
@@ -136,7 +136,7 @@
        e->ent_values[i] = NULL;
 }
 
-static int cfg_parse_file(char *filename) {
+static int cfg_parse_file(const char *filename) {
   struct CFG_ENTRIES * e = NULL;
   char line[256],tag[64],value[192];
   FILE *fp;