[GNUnet-SVN] r13179 - in gnunet/src: datacache datastore dht

[gnunet]

Author: grothoff
Date: 2010-10-06 12:04:41 +0200 (Wed, 06 Oct 2010)
New Revision: 13179

Modified:
   gnunet/src/datacache/plugin_datacache_mysql.c
   gnunet/src/datastore/plugin_datastore_mysql.c
   gnunet/src/dht/gnunet-service-dht.c
Log:
fix

Modified: gnunet/src/datacache/plugin_datacache_mysql.c
===================================================================
--- gnunet/src/datacache/plugin_datacache_mysql.c       2010-10-06 10:02:16 UTC 
(rev 13178)
+++ gnunet/src/datacache/plugin_datacache_mysql.c       2010-10-06 10:04:41 UTC 
(rev 13179)
@@ -479,7 +479,7 @@
   memset (qbind, 0, sizeof (qbind));
   off = 0;
   ft = 0;
-  while ((pc > 0) && (-1 != (ft = va_arg (ap, enum enum_field_types))))
+  while ( (pc > 0) && (-1 != (int) (ft = va_arg (ap, enum enum_field_types))) )
     {
       qbind[off].buffer_type = ft;
       switch (ft)
@@ -510,7 +510,7 @@
       pc--;
       off++;
     }
-  if (!((pc == 0) && (ft != -1) && (va_arg (ap, int) == -1)))
+  if (! ( (pc == 0) && (-1 != (int) ft) && (va_arg (ap, int) == -1)) )
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;

Modified: gnunet/src/datastore/plugin_datastore_mysql.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_mysql.c       2010-10-06 10:02:16 UTC 
(rev 13178)
+++ gnunet/src/datastore/plugin_datastore_mysql.c       2010-10-06 10:04:41 UTC 
(rev 13179)
@@ -663,7 +663,7 @@
   memset (qbind, 0, sizeof (qbind));
   off = 0;
   ft = 0;
-  while ((pc > 0) && (-1 != (ft = va_arg (ap, enum enum_field_types))))
+  while ((pc > 0) && (-1 != (int) (ft = va_arg (ap, enum enum_field_types))))
     {
       qbind[off].buffer_type = ft;
       switch (ft)
@@ -694,7 +694,7 @@
       pc--;
       off++;
     }
-  if (!((pc == 0) && (ft != -1) && (va_arg (ap, int) == -1)))
+  if (! ( (pc == 0) && (-1 != (int) ft) && (va_arg (ap, int) == -1) ) )
     {
       GNUNET_break (0);
       return GNUNET_SYSERR;

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-10-06 10:02:16 UTC (rev 13178)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-10-06 10:04:41 UTC (rev 13179)
@@ -3849,7 +3849,6 @@
   put_message.type = htonl(GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE);
   put_message.expiration = 
GNUNET_TIME_absolute_hton(GNUNET_TIME_absolute_get_forever());
   memset(&message_context, 0, sizeof(struct DHT_MessageContext));
-  message_context.client = NULL;
   random_key = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 
(uint32_t)-1);
   GNUNET_CRYPTO_hash(&random_key, sizeof(uint32_t), &key);
   memcpy(&message_context.key, &key, sizeof(GNUNET_HashCode));