bad sizeof

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 76c2b93522080bf4c7b0b4af576f083caa34ca7e..86d1a9f3711e1eddc1bb0ac7bec3351e130bc508 100644 (file)
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -1151,7 +1151,7 @@ GNUNET_is_zero_ (const void *a,
  * @return 0 if a is zero, non-zero otherwise
  */
 #define GNUNET_is_zero(a)           \
-  GNUNET_is_zero_ (a, sizeof (a))
+  GNUNET_is_zero_ (a, sizeof (*a))
 
 
 /**

diff --git a/src/util/mq.c b/src/util/mq.c
index 003e0955db273054f9d26ff92fbf1156fd7eb950..78dc7dba23d28d47ca7f8590bc08103c15d32f67 100644 (file)
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -297,7 +297,8 @@ done:
  * @param error the error type
  */
 void
-GNUNET_MQ_inject_error (struct GNUNET_MQ_Handle *mq, enum GNUNET_MQ_Error error)
+GNUNET_MQ_inject_error (struct GNUNET_MQ_Handle *mq,
+                        enum GNUNET_MQ_Error error)
 {
   if (NULL == mq->error_handler)
   {
@@ -306,7 +307,8 @@ GNUNET_MQ_inject_error (struct GNUNET_MQ_Handle *mq, enum GNUNET_MQ_Error error)
          (int) error);
     return;
   }
-  mq->error_handler (mq->error_handler_cls, error);
+  mq->error_handler (mq->error_handler_cls,
+                     error);
 }
 
 

diff --git a/src/util/service.c b/src/util/service.c
index 999a9e0172302c32971a11f127b2323efc20a4ee..9dc14eba967486bb4e890d4446cc79e36f4e42f5 100644 (file)
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -468,7 +468,6 @@ check_ipv6_listed (const struct GNUNET_STRINGS_IPv6NetworkPolicy *list,
                    const struct in6_addr *ip)
 {
   unsigned int i;
-  unsigned int j;
 
   if (NULL == list)
     return GNUNET_NO;
@@ -476,7 +475,7 @@ check_ipv6_listed (const struct GNUNET_STRINGS_IPv6NetworkPolicy *list,
 NEXT:
   while (0 != GNUNET_is_zero (&list[i].network))
   {
-    for (j = 0; j < sizeof(struct in6_addr) / sizeof(int); j++)
+    for (unsigned int j = 0; j < sizeof(struct in6_addr) / sizeof(int); j++)
       if (((((int *) ip)[j] & ((int *) &list[i].netmask)[j])) !=
           (((int *) &list[i].network)[j] & ((int *) &list[i].netmask)[j]))
       {