[GNUnet-SVN] r30242 - in gnunet/src: arm ats-tests

[gnunet]

Author: grothoff
Date: 2013-10-17 09:19:03 +0200 (Thu, 17 Oct 2013)
New Revision: 30242

Modified:
   gnunet/src/arm/gnunet-service-arm.c
   gnunet/src/ats-tests/perf_ats.c
Log:
-style fixes

Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2013-10-16 21:58:23 UTC (rev 30241)
+++ gnunet/src/arm/gnunet-service-arm.c 2013-10-17 07:19:03 UTC (rev 30242)
@@ -595,8 +595,10 @@
   static int on = 1;
   struct GNUNET_NETWORK_Handle *sock;
   struct ServiceListeningInfo *sli;
+#ifndef WINDOWS
   int match_uid;
   int match_gid;
+#endif
 
   switch (sa->sa_family)
   {
@@ -673,7 +675,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
              _("ARM now monitors connections to service `%s' at `%s'\n"),
              sl->name, GNUNET_a2s (sa, addr_len));
-  sli = GNUNET_malloc (sizeof (struct ServiceListeningInfo));
+  sli = GNUNET_new (struct ServiceListeningInfo);
   sli->service_addr = sa;
   sli->service_addr_len = addr_len;
   sli->listen_socket = sock;

Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c     2013-10-16 21:58:23 UTC (rev 30241)
+++ gnunet/src/ats-tests/perf_ats.c     2013-10-17 07:19:03 UTC (rev 30242)
@@ -129,7 +129,7 @@
 /**
  * Number master peers
  */
-static int num_masters;
+static unsigned int num_masters;
 
 /**
  * Array of master peers
@@ -139,7 +139,8 @@
 /**
  * Number slave peers
  */
-static int num_slaves;
+static unsigned int num_slaves;
+
 /**
  * Array of slave peers
  */