aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-11-24 19:13:00 +0100
committerChristian Grothoff <christian@grothoff.org>2019-11-24 19:13:00 +0100
commitd17a17ea785f91c18b5694eab3372c4e4564d95e (patch)
treea7ee983fb1c0fa5a9210938024357cd9498ee344
parent5f38569fce2e77afeed58cbd3429c67bf8ab9109 (diff)
downloadgnunet-d17a17ea785f91c18b5694eab3372c4e4564d95e.tar.gz
gnunet-d17a17ea785f91c18b5694eab3372c4e4564d95e.zip
fix pointer indentation
-rw-r--r--src/abe/abe.c20
-rw-r--r--src/abe/test_cpabe.c4
-rw-r--r--src/auction/gnunet-auction-create.c2
-rw-r--r--src/auction/gnunet-auction-info.c2
-rw-r--r--src/auction/gnunet-auction-join.c2
-rw-r--r--src/conversation/gnunet-conversation-test.c2
-rw-r--r--src/conversation/gnunet_gst_test.c2
-rw-r--r--src/dns/dns_api.c2
-rw-r--r--src/dns/gnunet-dns-monitor.c2
-rw-r--r--src/dns/gnunet-dns-redirector.c2
-rw-r--r--src/exit/gnunet-daemon-exit.c2
-rw-r--r--src/exit/gnunet-helper-exit.c26
-rw-r--r--src/fs/gnunet-fs-profiler.c2
-rw-r--r--src/gns/gns_api.c4
-rw-r--r--src/gns/gnunet-dns2gns.c4
-rw-r--r--src/gns/gnunet-gns-benchmark.c2
-rw-r--r--src/gns/gnunet-gns-import.c2
-rw-r--r--src/gns/gnunet-gns-proxy.c2
-rw-r--r--src/gns/gnunet-service-gns.c2
-rw-r--r--src/gns/gnunet-service-gns_interceptor.c4
-rw-r--r--src/gns/nss/nss_gns.c10
-rw-r--r--src/hostlist/gnunet-daemon-hostlist.c2
-rw-r--r--src/include/gauger.h12
-rw-r--r--src/include/gnunet_bio_lib.h4
-rw-r--r--src/include/gnunet_common.h2
-rw-r--r--src/include/gnunet_mq_lib.h6
-rw-r--r--src/include/platform.h4
-rw-r--r--src/json/json_gnsrecord.c2
-rw-r--r--src/json/json_helper.c4
-rw-r--r--src/namecache/plugin_namecache_flat.c6
-rw-r--r--src/namecache/test_plugin_namecache.c2
-rw-r--r--src/namestore/gnunet-namestore-fcfsd.c2
-rw-r--r--src/namestore/plugin_namestore_flat.c4
-rw-r--r--src/peerinfo-tool/plugin_rest_peerinfo.c2
-rw-r--r--src/peerstore/plugin_peerstore_flat.c6
-rw-r--r--src/peerstore/test_plugin_peerstore.c4
-rw-r--r--src/pt/gnunet-daemon-pt.c4
-rw-r--r--src/pt/test_gns_vpn.c4
-rw-r--r--src/regex/gnunet-regex-profiler.c2
-rw-r--r--src/rest/rest.c4
-rw-r--r--src/secretsharing/gnunet-service-secretsharing.c2
-rw-r--r--src/set/gnunet-service-set_intersection.c8
-rw-r--r--src/set/gnunet-service-set_union_strata_estimator.c4
-rw-r--r--src/testbed/gnunet-daemon-latency-logger.c2
-rw-r--r--src/testbed/gnunet-daemon-testbed-blacklist.c2
-rw-r--r--src/testbed/gnunet-daemon-testbed-underlay.c2
-rw-r--r--src/testbed/gnunet-service-testbed_meminfo.c5
-rw-r--r--src/transport/gnunet-helper-transport-bluetooth.c2
-rw-r--r--src/transport/gnunet-helper-transport-wlan.c10
-rw-r--r--src/transport/plugin_transport_wlan.c2
-rw-r--r--src/util/crypto_abe.c20
-rw-r--r--src/util/crypto_ecc_dlog.c4
-rw-r--r--src/util/crypto_hash.c4
-rw-r--r--src/util/gnunet-resolver.c2
-rw-r--r--src/util/test_common_logging_runtime_loglevels.c6
-rw-r--r--src/util/test_socks.c2
56 files changed, 129 insertions, 124 deletions
diff --git a/src/abe/abe.c b/src/abe/abe.c
index dbd722ca3..a03944821 100644
--- a/src/abe/abe.c
+++ b/src/abe/abe.c
@@ -56,7 +56,7 @@ init_aes (element_t k, int enc,
56 unsigned char*key_buf; 56 unsigned char*key_buf;
57 57
58 key_len = element_length_in_bytes (k) < 33 ? 3 : element_length_in_bytes (k); 58 key_len = element_length_in_bytes (k) < 33 ? 3 : element_length_in_bytes (k);
59 key_buf = (unsigned char*) malloc (key_len); 59 key_buf = (unsigned char *) malloc (key_len);
60 element_to_bytes (key_buf, k); 60 element_to_bytes (key_buf, k);
61 61
62 GNUNET_memcpy (key->aes_key, key_buf, GNUNET_CRYPTO_AES_KEY_LENGTH); 62 GNUNET_memcpy (key->aes_key, key_buf, GNUNET_CRYPTO_AES_KEY_LENGTH);
@@ -247,15 +247,15 @@ write_cpabe (void **result,
247 247
248 *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len); 248 *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len);
249 ptr = *result; 249 ptr = *result;
250 len = (uint32_t*) ptr; 250 len = (uint32_t *) ptr;
251 *len = htonl (file_len); 251 *len = htonl (file_len);
252 ptr += 4; 252 ptr += 4;
253 len = (uint32_t*) ptr; 253 len = (uint32_t *) ptr;
254 *len = htonl (aes_buf_len); 254 *len = htonl (aes_buf_len);
255 ptr += 4; 255 ptr += 4;
256 GNUNET_memcpy (ptr, aes_buf, aes_buf_len); 256 GNUNET_memcpy (ptr, aes_buf, aes_buf_len);
257 ptr += aes_buf_len; 257 ptr += aes_buf_len;
258 len = (uint32_t*) ptr; 258 len = (uint32_t *) ptr;
259 *len = htonl (cph_buf_len); 259 *len = htonl (cph_buf_len);
260 ptr += 4; 260 ptr += 4;
261 GNUNET_memcpy (ptr, cph_buf, cph_buf_len); 261 GNUNET_memcpy (ptr, cph_buf, cph_buf_len);
@@ -274,17 +274,17 @@ read_cpabe (const void *data,
274 char *ptr; 274 char *ptr;
275 uint32_t *len; 275 uint32_t *len;
276 276
277 ptr = (char*) data; 277 ptr = (char *) data;
278 len = (uint32_t*) ptr; 278 len = (uint32_t *) ptr;
279 buf_len = ntohl (*len); 279 buf_len = ntohl (*len);
280 ptr += 4; 280 ptr += 4;
281 len = (uint32_t*) ptr; 281 len = (uint32_t *) ptr;
282 *aes_buf_len = ntohl (*len); 282 *aes_buf_len = ntohl (*len);
283 ptr += 4; 283 ptr += 4;
284 *aes_buf = GNUNET_malloc (*aes_buf_len); 284 *aes_buf = GNUNET_malloc (*aes_buf_len);
285 GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len); 285 GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len);
286 ptr += *aes_buf_len; 286 ptr += *aes_buf_len;
287 len = (uint32_t*) ptr; 287 len = (uint32_t *) ptr;
288 *cph_buf_len = ntohl (*len); 288 *cph_buf_len = ntohl (*len);
289 ptr += 4; 289 ptr += 4;
290 *cph_buf = GNUNET_malloc (*cph_buf_len); 290 *cph_buf = GNUNET_malloc (*cph_buf_len);
@@ -321,7 +321,7 @@ GNUNET_ABE_cpabe_encrypt (const void *block,
321 int aes_buf_len; 321 int aes_buf_len;
322 ssize_t result_len; 322 ssize_t result_len;
323 323
324 if (! (cph = gabe_enc (key->pub, m, (char*) policy))) 324 if (! (cph = gabe_enc (key->pub, m, (char *) policy)))
325 return GNUNET_SYSERR; 325 return GNUNET_SYSERR;
326 cph_buf_len = gabe_cph_serialize (cph, 326 cph_buf_len = gabe_cph_serialize (cph,
327 &cph_buf); 327 &cph_buf);
@@ -378,7 +378,7 @@ GNUNET_ABE_cpabe_decrypt (const void *block,
378 } 378 }
379 gabe_cph_free (cph); 379 gabe_cph_free (cph);
380 GNUNET_free (cph); 380 GNUNET_free (cph);
381 plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char**) result); 381 plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char **) result);
382 GNUNET_free (cph_buf); 382 GNUNET_free (cph_buf);
383 GNUNET_free (aes_buf); 383 GNUNET_free (aes_buf);
384 element_clear (m); 384 element_clear (m);
diff --git a/src/abe/test_cpabe.c b/src/abe/test_cpabe.c
index 2ac4ef0a8..aefb0f99f 100644
--- a/src/abe/test_cpabe.c
+++ b/src/abe/test_cpabe.c
@@ -43,7 +43,7 @@ testAbecipher ()
43 size = GNUNET_ABE_cpabe_encrypt (TESTSTRING, strlen (TESTSTRING) + 1, 43 size = GNUNET_ABE_cpabe_encrypt (TESTSTRING, strlen (TESTSTRING) + 1,
44 "testattr", // Policy 44 "testattr", // Policy
45 msk, 45 msk,
46 (void*) &result); 46 (void *) &result);
47 GNUNET_assert (-1 != size); 47 GNUNET_assert (-1 != size);
48 attrs = GNUNET_malloc (2 * sizeof(char*)); 48 attrs = GNUNET_malloc (2 * sizeof(char*));
49 attrs[0] = "testattr"; 49 attrs[0] = "testattr";
@@ -53,7 +53,7 @@ testAbecipher ()
53 53
54 size = GNUNET_ABE_cpabe_decrypt (result, size, 54 size = GNUNET_ABE_cpabe_decrypt (result, size,
55 key, 55 key,
56 (void*) &res); 56 (void *) &res);
57 if (strlen (TESTSTRING) + 1 != size) 57 if (strlen (TESTSTRING) + 1 != size)
58 { 58 {
59 printf ("abeciphertest failed: decryptBlock returned %d\n", size); 59 printf ("abeciphertest failed: decryptBlock returned %d\n", size);
diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c
index 90c1d5f10..79106d8e8 100644
--- a/src/auction/gnunet-auction-create.c
+++ b/src/auction/gnunet-auction-create.c
@@ -214,6 +214,6 @@ main (int argc, char *const *argv)
214 options, 214 options,
215 &run, 215 &run,
216 NULL)) ? ret : 1; 216 NULL)) ? ret : 1;
217 GNUNET_free ((void*) argv); 217 GNUNET_free ((void *) argv);
218 return ret; 218 return ret;
219} 219}
diff --git a/src/auction/gnunet-auction-info.c b/src/auction/gnunet-auction-info.c
index 5a3587a40..f20565835 100644
--- a/src/auction/gnunet-auction-info.c
+++ b/src/auction/gnunet-auction-info.c
@@ -78,7 +78,7 @@ main (int argc, char *const *argv)
78 options, 78 options,
79 &run, 79 &run,
80 NULL)) ? ret : 1; 80 NULL)) ? ret : 1;
81 GNUNET_free ((void*) argv); 81 GNUNET_free ((void *) argv);
82 return ret; 82 return ret;
83} 83}
84 84
diff --git a/src/auction/gnunet-auction-join.c b/src/auction/gnunet-auction-join.c
index 5a3587a40..f20565835 100644
--- a/src/auction/gnunet-auction-join.c
+++ b/src/auction/gnunet-auction-join.c
@@ -78,7 +78,7 @@ main (int argc, char *const *argv)
78 options, 78 options,
79 &run, 79 &run,
80 NULL)) ? ret : 1; 80 NULL)) ? ret : 1;
81 GNUNET_free ((void*) argv); 81 GNUNET_free ((void *) argv);
82 return ret; 82 return ret;
83} 83}
84 84
diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c
index 307b55435..2e6772d92 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -257,7 +257,7 @@ main (int argc,
257 options, 257 options,
258 &run, 258 &run,
259 NULL)) ? ret : 1; 259 NULL)) ? ret : 1;
260 GNUNET_free ((void*) argv); 260 GNUNET_free ((void *) argv);
261 return ret; 261 return ret;
262} 262}
263 263
diff --git a/src/conversation/gnunet_gst_test.c b/src/conversation/gnunet_gst_test.c
index 98054797c..a7364aece 100644
--- a/src/conversation/gnunet_gst_test.c
+++ b/src/conversation/gnunet_gst_test.c
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
40 40
41 // GstPipeline *pipeline; 41 // GstPipeline *pipeline;
42 42
43 gst = (GNUNET_gstData*) malloc (sizeof(struct GNUNET_gstData)); 43 gst = (GNUNET_gstData *) malloc (sizeof(struct GNUNET_gstData));
44 44
45 // gst->audio_message.header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO); 45 // gst->audio_message.header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO);
46 46
diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index 5969102b9..448d86a17 100644
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -189,7 +189,7 @@ handle_request (void *cls,
189 dh->rh (dh->rh_cls, 189 dh->rh (dh->rh_cls,
190 rh, 190 rh,
191 payload_length, 191 payload_length,
192 (const char*) &req[1]); 192 (const char *) &req[1]);
193} 193}
194 194
195 195
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index 311544f2e..7be792fc5 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -387,7 +387,7 @@ main (int argc, char *const *argv)
387 gettext_noop 387 gettext_noop
388 ("Monitor DNS queries."), options, 388 ("Monitor DNS queries."), options,
389 &run, NULL)) ? ret : 1; 389 &run, NULL)) ? ret : 1;
390 GNUNET_free ((void*) argv); 390 GNUNET_free ((void *) argv);
391 return ret; 391 return ret;
392} 392}
393 393
diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c
index 6a3899a46..f7051f70b 100644
--- a/src/dns/gnunet-dns-redirector.c
+++ b/src/dns/gnunet-dns-redirector.c
@@ -260,7 +260,7 @@ main (int argc, char *const *argv)
260 ("Change DNS replies to point elsewhere."), 260 ("Change DNS replies to point elsewhere."),
261 options, 261 options,
262 &run, NULL)) ? ret : 1; 262 &run, NULL)) ? ret : 1;
263 GNUNET_free ((void*) argv); 263 GNUNET_free ((void *) argv);
264 return ret; 264 return ret;
265} 265}
266 266
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index c479720d4..6ac4fc38c 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -582,7 +582,7 @@ hash_redirect_info (struct GNUNET_HashCode *hash,
582 sizeof(struct GNUNET_HashCode)); 582 sizeof(struct GNUNET_HashCode));
583 /* the GNUnet hashmap only uses the first sizeof(unsigned int) of the hash, 583 /* the GNUnet hashmap only uses the first sizeof(unsigned int) of the hash,
584 so we put the IP address in there (and hope for few collisions) */ 584 so we put the IP address in there (and hope for few collisions) */
585 off = (char*) hash; 585 off = (char *) hash;
586 switch (ri->remote_address.af) 586 switch (ri->remote_address.af)
587 { 587 {
588 case AF_INET: 588 case AF_INET:
diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c
index 8fd8bedaa..d46032662 100644
--- a/src/exit/gnunet-helper-exit.c
+++ b/src/exit/gnunet-helper-exit.c
@@ -85,7 +85,7 @@ static const char *sbin_sysctl;
85static const char *sbin_iptables; 85static const char *sbin_iptables;
86 86
87 87
88#if !defined(_LINUX_IN6_H) && defined(__linux__) 88#if ! defined(_LINUX_IN6_H) && defined(__linux__)
89/** 89/**
90 * This is in linux/include/net/ipv6.h, but not always exported. 90 * This is in linux/include/net/ipv6.h, but not always exported.
91 */ 91 */
@@ -234,32 +234,36 @@ init_tun (char *dev)
234 strcpy (dev, ifr.ifr_name); 234 strcpy (dev, ifr.ifr_name);
235 return fd; 235 return fd;
236} 236}
237
238
237#else /* BSD et al, including DARWIN */ 239#else /* BSD et al, including DARWIN */
238 240
239#ifdef SIOCIFCREATE 241#ifdef SIOCIFCREATE
240static int 242static int
241init_tun(char *dev) 243init_tun (char *dev)
242{ 244{
243 int fd; 245 int fd;
244 int s; 246 int s;
245 struct ifreq ifr; 247 struct ifreq ifr;
246 248
247 fd = open(dev, O_RDWR); 249 fd = open (dev, O_RDWR);
248 if(fd == -1) 250 if (fd == -1)
249 { 251 {
250 s = socket(AF_INET, SOCK_DGRAM, 0); 252 s = socket (AF_INET, SOCK_DGRAM, 0);
251 if (s < 0) 253 if (s < 0)
252 return -1; 254 return -1;
253 memset(&ifr, 0, sizeof(ifr)); 255 memset (&ifr, 0, sizeof(ifr));
254 strncpy(ifr.ifr_name, dev + 5, sizeof(ifr.ifr_name) - 1); 256 strncpy (ifr.ifr_name, dev + 5, sizeof(ifr.ifr_name) - 1);
255 if (!ioctl(s, SIOCIFCREATE, &ifr)) 257 if (! ioctl (s, SIOCIFCREATE, &ifr))
256 fd = open(dev, O_RDWR); 258 fd = open (dev, O_RDWR);
257 close(s); 259 close (s);
258 } 260 }
259 return fd; 261 return fd;
260} 262}
263
264
261#else 265#else
262#define init_tun(dev) open(dev, O_RDWR) 266#define init_tun(dev) open (dev, O_RDWR)
263#endif 267#endif
264#endif /* !IFF_TUN (BSD) */ 268#endif /* !IFF_TUN (BSD) */
265 269
diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c
index 6aad92055..fe86cf21f 100644
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/fs/gnunet-fs-profiler.c
@@ -237,7 +237,7 @@ main (int argc, char *const *argv)
237 "run a testbed to measure file-sharing performance"), 237 "run a testbed to measure file-sharing performance"),
238 options, &run, 238 options, &run,
239 NULL)) ? ret : 1; 239 NULL)) ? ret : 1;
240 GNUNET_free ((void*) argv); 240 GNUNET_free ((void *) argv);
241 return ret; 241 return ret;
242} 242}
243 243
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index fe0707baa..4b3202bc5 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -159,7 +159,7 @@ check_result (void *cls,
159 (void) cls; 159 (void) cls;
160 if (GNUNET_SYSERR == 160 if (GNUNET_SYSERR ==
161 GNUNET_GNSRECORD_records_deserialize (mlen, 161 GNUNET_GNSRECORD_records_deserialize (mlen,
162 (const char*) &lookup_msg[1], 162 (const char *) &lookup_msg[1],
163 rd_count, 163 rd_count,
164 rd)) 164 rd))
165 { 165 {
@@ -203,7 +203,7 @@ handle_result (void *cls,
203 GNUNET_assert (GNUNET_OK == 203 GNUNET_assert (GNUNET_OK ==
204 GNUNET_GNSRECORD_records_deserialize (mlen, 204 GNUNET_GNSRECORD_records_deserialize (mlen,
205 (const 205 (const
206 char*) &lookup_msg[1], 206 char *) &lookup_msg[1],
207 rd_count, 207 rd_count,
208 rd)); 208 rd));
209 proc (proc_cls, 209 proc (proc_cls,
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 81a12de0a..8ec1f1cdb 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -279,7 +279,7 @@ dns_result_processor (void *cls,
279 /* for a another query, ignore */ 279 /* for a another query, ignore */
280 return; 280 return;
281 } 281 }
282 request->packet = GNUNET_DNSPARSER_parse ((char*) dns, 282 request->packet = GNUNET_DNSPARSER_parse ((char *) dns,
283 r); 283 r);
284 GNUNET_DNSSTUB_resolve_cancel (request->dns_lookup); 284 GNUNET_DNSSTUB_resolve_cancel (request->dns_lookup);
285 send_response (request); 285 send_response (request);
@@ -775,7 +775,7 @@ main (int argc,
775 _ ("GNUnet DNS-to-GNS proxy (a DNS server)"), 775 _ ("GNUnet DNS-to-GNS proxy (a DNS server)"),
776 options, 776 options,
777 &run, NULL)) ? 0 : 1; 777 &run, NULL)) ? 0 : 1;
778 GNUNET_free ((void*) argv); 778 GNUNET_free ((void *) argv);
779 return ret; 779 return ret;
780} 780}
781 781
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c
index bf13efb11..0dcff7566 100644
--- a/src/gns/gnunet-gns-benchmark.c
+++ b/src/gns/gnunet-gns-benchmark.c
@@ -610,7 +610,7 @@ main (int argc,
610 &run, 610 &run,
611 NULL)) 611 NULL))
612 ret = 1; 612 ret = 1;
613 GNUNET_free ((void*) argv); 613 GNUNET_free ((void *) argv);
614 return ret; 614 return ret;
615} 615}
616 616
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c
index 0dc04064a..0c104ee0d 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/gns/gnunet-gns-import.c
@@ -486,7 +486,7 @@ main (int argc, char *const *argv)
486 "This program will import some GNS authorities into your GNS namestore."), 486 "This program will import some GNS authorities into your GNS namestore."),
487 options, 487 options,
488 &run, NULL); 488 &run, NULL);
489 GNUNET_free ((void*) argv); 489 GNUNET_free ((void *) argv);
490 return GNUNET_OK == r ? ret : 1; 490 return GNUNET_OK == r ? ret : 1;
491} 491}
492 492
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 7a5dbb627..5b8348d43 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -3361,7 +3361,7 @@ do_s5r_read (void *cls)
3361 + alen + sizeof(uint16_t)) 3361 + alen + sizeof(uint16_t))
3362 return; /* need more data */ 3362 return; /* need more data */
3363 dom_name = (const char *) &dom_len[1]; 3363 dom_name = (const char *) &dom_len[1];
3364 port = (const uint16_t*) &dom_name[*dom_len]; 3364 port = (const uint16_t *) &dom_name[*dom_len];
3365 s5r->domain = GNUNET_strndup (dom_name, 3365 s5r->domain = GNUNET_strndup (dom_name,
3366 *dom_len); 3366 *dom_len);
3367 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3367 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 57ab393b0..99cdbfe4e 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -366,7 +366,7 @@ send_lookup_response (void *cls,
366 GNUNET_GNSRECORD_records_serialize (rd_count, 366 GNUNET_GNSRECORD_records_serialize (rd_count,
367 rd, 367 rd,
368 len, 368 len,
369 (char*) &rmsg[1])); 369 (char *) &rmsg[1]));
370 GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (gc->client), 370 GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (gc->client),
371 env); 371 env);
372 GNUNET_CONTAINER_DLL_remove (gc->clh_head, 372 GNUNET_CONTAINER_DLL_remove (gc->clh_head,
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index a44d36c89..dd97782ae 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -178,7 +178,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
178 178
179 default: 179 default:
180 answer_records[i - skip_answers].data.raw.data_len = rd[i].data_size; 180 answer_records[i - skip_answers].data.raw.data_len = rd[i].data_size;
181 answer_records[i - skip_answers].data.raw.data = (char*) rd[i].data; 181 answer_records[i - skip_answers].data.raw.data = (char *) rd[i].data;
182 break; 182 break;
183 } 183 }
184 GNUNET_break (0 == (rd[i - skip_answers].flags 184 GNUNET_break (0 == (rd[i - skip_answers].flags
@@ -244,7 +244,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
244 additional_records[i - skip_additional].data.raw.data_len = 244 additional_records[i - skip_additional].data.raw.data_len =
245 rd[i].data_size; 245 rd[i].data_size;
246 additional_records[i - skip_additional].data.raw.data = 246 additional_records[i - skip_additional].data.raw.data =
247 (char*) rd[i].data; 247 (char *) rd[i].data;
248 break; 248 break;
249 } 249 }
250 GNUNET_break (0 == (rd[i - skip_additional].flags 250 GNUNET_break (0 == (rd[i - skip_additional].flags
diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c
index beae4d15e..36799ba3a 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/gns/nss/nss_gns.c
@@ -139,8 +139,8 @@ _nss_gns_gethostbyname2_r (const char *name,
139 goto finish; 139 goto finish;
140 } 140 }
141 /* Alias names */ 141 /* Alias names */
142 *((char**) buffer) = NULL; 142 *((char **) buffer) = NULL;
143 result->h_aliases = (char**) buffer; 143 result->h_aliases = (char **) buffer;
144 idx = sizeof(char*); 144 idx = sizeof(char*);
145 145
146 /* Official name */ 146 /* Official name */
@@ -175,9 +175,9 @@ _nss_gns_gethostbyname2_r (const char *name,
175 175
176 /* Address array address_length is always a multiple of 32bits */ 176 /* Address array address_length is always a multiple of 32bits */
177 for (i = 0; i < u.count; i++) 177 for (i = 0; i < u.count; i++)
178 ((char**) (buffer + idx))[i] = buffer + astart + address_length * i; 178 ((char **) (buffer + idx))[i] = buffer + astart + address_length * i;
179 ((char**) (buffer + idx))[i] = NULL; 179 ((char **) (buffer + idx))[i] = NULL;
180 result->h_addr_list = (char**) (buffer + idx); 180 result->h_addr_list = (char **) (buffer + idx);
181 181
182 status = NSS_STATUS_SUCCESS; 182 status = NSS_STATUS_SUCCESS;
183 183
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index adb1a328d..ca77545cd 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -409,7 +409,7 @@ main (int argc, char *const *argv)
409 _ ("GNUnet hostlist server and client"), 409 _ ("GNUnet hostlist server and client"),
410 options, 410 options,
411 &run, NULL)) ? 0 : 1; 411 &run, NULL)) ? 0 : 1;
412 GNUNET_free ((void*) argv); 412 GNUNET_free ((void *) argv);
413 return ret; 413 return ret;
414} 414}
415 415
diff --git a/src/include/gauger.h b/src/include/gauger.h
index ac86ee586..716ce9cb1 100644
--- a/src/include/gauger.h
+++ b/src/include/gauger.h
@@ -27,14 +27,14 @@
27 sprintf (__gauger_s, "%Lf", (long double) (value)); \ 27 sprintf (__gauger_s, "%Lf", (long double) (value)); \
28 __gauger_v[0] = "gauger"; \ 28 __gauger_v[0] = "gauger"; \
29 __gauger_v[1] = "-n"; \ 29 __gauger_v[1] = "-n"; \
30 __gauger_v[2] = (char*) (counter); \ 30 __gauger_v[2] = (char *) (counter); \
31 __gauger_v[3] = "-d"; \ 31 __gauger_v[3] = "-d"; \
32 __gauger_v[4] = __gauger_s; \ 32 __gauger_v[4] = __gauger_s; \
33 __gauger_v[5] = "-u"; \ 33 __gauger_v[5] = "-u"; \
34 __gauger_v[6] = (char*) (unit); \ 34 __gauger_v[6] = (char *) (unit); \
35 __gauger_v[7] = "-c"; \ 35 __gauger_v[7] = "-c"; \
36 __gauger_v[8] = (char*) (category); \ 36 __gauger_v[8] = (char *) (category); \
37 __gauger_v[9] = (char*) NULL; \ 37 __gauger_v[9] = (char *) NULL; \
38 execvp ("gauger", __gauger_v); \ 38 execvp ("gauger", __gauger_v); \
39 _exit (1); \ 39 _exit (1); \
40 }else{ \ 40 }else{ \
@@ -57,11 +57,11 @@
57 sprintf (__gauger_s, "%Lf", (long double) (value)); \ 57 sprintf (__gauger_s, "%Lf", (long double) (value)); \
58 __gauger_v[0] = "gauger"; \ 58 __gauger_v[0] = "gauger"; \
59 __gauger_v[1] = "-n"; \ 59 __gauger_v[1] = "-n"; \
60 __gauger_v[2] = (char*) (counter); \ 60 __gauger_v[2] = (char *) (counter); \
61 __gauger_v[3] = "-d"; \ 61 __gauger_v[3] = "-d"; \
62 __gauger_v[4] = __gauger_s; \ 62 __gauger_v[4] = __gauger_s; \
63 __gauger_v[5] = "-u"; \ 63 __gauger_v[5] = "-u"; \
64 __gauger_v[6] = (char*) (unit); \ 64 __gauger_v[6] = (char *) (unit); \
65 __gauger_v[7] = "-i"; \ 65 __gauger_v[7] = "-i"; \
66 __gauger_v[8] = id; \ 66 __gauger_v[8] = id; \
67 __gauger_v[9] = "-c"; \ 67 __gauger_v[9] = "-c"; \
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 34dd46dd5..2f715ec97 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -169,7 +169,7 @@ GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h, const char *file,
169 */ 169 */
170#define GNUNET_BIO_read_int32(h, i) GNUNET_BIO_read_int32__ (h, __FILE__, \ 170#define GNUNET_BIO_read_int32(h, i) GNUNET_BIO_read_int32__ (h, __FILE__, \
171 __LINE__, \ 171 __LINE__, \
172 (int32_t*) i) 172 (int32_t *) i)
173 173
174 174
175/** 175/**
@@ -194,7 +194,7 @@ GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h, const char *file,
194 */ 194 */
195#define GNUNET_BIO_read_int64(h, i) GNUNET_BIO_read_int64__ (h, __FILE__, \ 195#define GNUNET_BIO_read_int64(h, i) GNUNET_BIO_read_int64__ (h, __FILE__, \
196 __LINE__, \ 196 __LINE__, \
197 (int64_t*) i) 197 (int64_t *) i)
198 198
199 199
200/** 200/**
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 4fdc2d777..f4f68a95f 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -1084,7 +1084,7 @@ GNUNET_ntoh_double (double d);
1084 */ 1084 */
1085#define GNUNET_is_zero(a) \ 1085#define GNUNET_is_zero(a) \
1086 ({ \ 1086 ({ \
1087 static const typeof (*a) _z; \ 1087 static const typeof (*a)_z; \
1088 memcmp ((a), &_z, sizeof(_z)); \ 1088 memcmp ((a), &_z, sizeof(_z)); \
1089 }) 1089 })
1090 1090
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 37f21e5b1..520027dbb 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -547,7 +547,7 @@ struct GNUNET_MQ_MessageHandler
547 */ 547 */
548#define GNUNET_MQ_hd_fixed_size(name, code, str, ctx) \ 548#define GNUNET_MQ_hd_fixed_size(name, code, str, ctx) \
549 ({ \ 549 ({ \
550 void (*_cb)(void *cls, const str *msg) = &handle_ ## name; \ 550 void (*_cb)(void *cls, const str * msg) = &handle_ ## name; \
551 ((struct GNUNET_MQ_MessageHandler){ NULL, \ 551 ((struct GNUNET_MQ_MessageHandler){ NULL, \
552 (GNUNET_MQ_MessageCallback) _cb, \ 552 (GNUNET_MQ_MessageCallback) _cb, \
553 (ctx), \ 553 (ctx), \
@@ -598,8 +598,8 @@ struct GNUNET_MQ_MessageHandler
598 */ 598 */
599#define GNUNET_MQ_hd_var_size(name, code, str, ctx) \ 599#define GNUNET_MQ_hd_var_size(name, code, str, ctx) \
600 __extension__ ({ \ 600 __extension__ ({ \
601 int (*_mv)(void *cls, const str *msg) = &check_ ## name; \ 601 int (*_mv)(void *cls, const str * msg) = &check_ ## name; \
602 void (*_cb)(void *cls, const str *msg) = &handle_ ## name; \ 602 void (*_cb)(void *cls, const str * msg) = &handle_ ## name; \
603 ((struct GNUNET_MQ_MessageHandler){ (GNUNET_MQ_MessageValidationCallback) \ 603 ((struct GNUNET_MQ_MessageHandler){ (GNUNET_MQ_MessageValidationCallback) \
604 _mv, \ 604 _mv, \
605 (GNUNET_MQ_MessageCallback) _cb, \ 605 (GNUNET_MQ_MessageCallback) _cb, \
diff --git a/src/include/platform.h b/src/include/platform.h
index 0cf4c9e5e..3b07f47ea 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -229,8 +229,8 @@ atoll (const char *nptr);
229 229
230 230
231#if defined(__sparc__) 231#if defined(__sparc__)
232#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove (&__tmp, &(val), \ 232#define MAKE_UNALIGNED(val) ({ __typeof__((val))__tmp; memmove (&__tmp, &(val), \
233 sizeof((val))); \ 233 sizeof((val))); \
234 __tmp; }) 234 __tmp; })
235#else 235#else
236#define MAKE_UNALIGNED(val) val 236#define MAKE_UNALIGNED(val) val
diff --git a/src/json/json_gnsrecord.c b/src/json/json_gnsrecord.c
index 41af2b0a2..bfbdd96ee 100644
--- a/src/json/json_gnsrecord.c
+++ b/src/json/json_gnsrecord.c
@@ -108,7 +108,7 @@ parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd)
108 } 108 }
109 if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (rd->record_type, 109 if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (rd->record_type,
110 value, 110 value,
111 (void**) &rd->data, 111 (void **) &rd->data,
112 &rd->data_size)) 112 &rd->data_size))
113 { 113 {
114 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Value invalid for record type\n"); 114 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Value invalid for record type\n");
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index c3ba9c555..a9b933762 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -152,7 +152,7 @@ parse_variable_data (void *cls,
152 GNUNET_free (data); 152 GNUNET_free (data);
153 return GNUNET_SYSERR; 153 return GNUNET_SYSERR;
154 } 154 }
155 *(void**) spec->ptr = data; 155 *(void **) spec->ptr = data;
156 *spec->size_ptr = size; 156 *spec->size_ptr = size;
157 return GNUNET_OK; 157 return GNUNET_OK;
158} 158}
@@ -171,7 +171,7 @@ clean_variable_data (void *cls,
171 if (0 != *spec->size_ptr) 171 if (0 != *spec->size_ptr)
172 { 172 {
173 GNUNET_free (*(void **) spec->ptr); 173 GNUNET_free (*(void **) spec->ptr);
174 *(void**) spec->ptr = NULL; 174 *(void **) spec->ptr = NULL;
175 *spec->size_ptr = 0; 175 *spec->size_ptr = 0;
176 } 176 }
177} 177}
diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c
index 69b54fcf3..91f53ce2b 100644
--- a/src/namecache/plugin_namecache_flat.c
+++ b/src/namecache/plugin_namecache_flat.c
@@ -171,7 +171,7 @@ database_setup (struct Plugin *plugin)
171 &entry->query)); 171 &entry->query));
172 GNUNET_STRINGS_base64_decode (block, 172 GNUNET_STRINGS_base64_decode (block,
173 strlen (block), 173 strlen (block),
174 (void**) &block_buffer); 174 (void **) &block_buffer);
175 entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer; 175 entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer;
176 if (GNUNET_OK != 176 if (GNUNET_OK !=
177 GNUNET_CONTAINER_multihashmap_put (plugin->hm, 177 GNUNET_CONTAINER_multihashmap_put (plugin->hm,
@@ -211,14 +211,14 @@ store_and_free_entries (void *cls,
211 + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) 211 + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey)
212 + sizeof(struct GNUNET_CRYPTO_EcdsaSignature); 212 + sizeof(struct GNUNET_CRYPTO_EcdsaSignature);
213 213
214 GNUNET_STRINGS_base64_encode ((char*) entry->block, 214 GNUNET_STRINGS_base64_encode ((char *) entry->block,
215 block_size, 215 block_size,
216 &block_b64); 216 &block_b64);
217 GNUNET_CRYPTO_hash_to_enc (&entry->query, 217 GNUNET_CRYPTO_hash_to_enc (&entry->query,
218 &query); 218 &query);
219 GNUNET_asprintf (&line, 219 GNUNET_asprintf (&line,
220 "%s,%s\n", 220 "%s,%s\n",
221 (char*) &query, 221 (char *) &query,
222 block_b64); 222 block_b64);
223 223
224 GNUNET_free (block_b64); 224 GNUNET_free (block_b64);
diff --git a/src/namecache/test_plugin_namecache.c b/src/namecache/test_plugin_namecache.c
index 5e0cd7cfd..f3cb46c02 100644
--- a/src/namecache/test_plugin_namecache.c
+++ b/src/namecache/test_plugin_namecache.c
@@ -68,7 +68,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
68 GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("Loading `%s' namecache plugin\n"), 68 GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("Loading `%s' namecache plugin\n"),
69 plugin_name); 69 plugin_name);
70 GNUNET_asprintf (&libname, "libgnunet_plugin_namecache_%s", plugin_name); 70 GNUNET_asprintf (&libname, "libgnunet_plugin_namecache_%s", plugin_name);
71 if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void*) cfg))) 71 if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void *) cfg)))
72 { 72 {
73 fprintf (stderr, "Failed to load plugin `%s'!\n", plugin_name); 73 fprintf (stderr, "Failed to load plugin `%s'!\n", plugin_name);
74 GNUNET_free (libname); 74 GNUNET_free (libname);
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index ca9f6ed0e..fa0f835d1 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -1209,7 +1209,7 @@ main (int argc,
1209 "GNU Name System First Come First Serve name registration service"), 1209 "GNU Name System First Come First Serve name registration service"),
1210 options, 1210 options,
1211 &run, NULL)) ? 0 : 1; 1211 &run, NULL)) ? 0 : 1;
1212 GNUNET_free ((void*) argv); 1212 GNUNET_free ((void *) argv);
1213 GNUNET_CRYPTO_ecdsa_key_clear (&fcfs_zone_pkey); 1213 GNUNET_CRYPTO_ecdsa_key_clear (&fcfs_zone_pkey);
1214 return ret; 1214 return ret;
1215} 1215}
diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c
index dbceab45d..60b24df67 100644
--- a/src/namestore/plugin_namestore_flat.c
+++ b/src/namestore/plugin_namestore_flat.c
@@ -300,7 +300,7 @@ database_setup (struct Plugin *plugin)
300 300
301 GNUNET_STRINGS_base64_decode (zone_private_key, 301 GNUNET_STRINGS_base64_decode (zone_private_key,
302 strlen (zone_private_key), 302 strlen (zone_private_key),
303 (void**) &private_key); 303 (void **) &private_key);
304 entry->private_key = *private_key; 304 entry->private_key = *private_key;
305 GNUNET_free (private_key); 305 GNUNET_free (private_key);
306 } 306 }
@@ -494,7 +494,7 @@ namestore_flat_store_records (void *cls,
494 entry->record_data[i].flags = rd[i].flags; 494 entry->record_data[i].flags = rd[i].flags;
495 entry->record_data[i].data_size = rd[i].data_size; 495 entry->record_data[i].data_size = rd[i].data_size;
496 entry->record_data[i].data = GNUNET_malloc (rd[i].data_size); 496 entry->record_data[i].data = GNUNET_malloc (rd[i].data_size);
497 GNUNET_memcpy ((char*) entry->record_data[i].data, 497 GNUNET_memcpy ((char *) entry->record_data[i].data,
498 rd[i].data, 498 rd[i].data,
499 rd[i].data_size); 499 rd[i].data_size);
500 } 500 }
diff --git a/src/peerinfo-tool/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c
index 7544b5ede..14559a8cf 100644
--- a/src/peerinfo-tool/plugin_rest_peerinfo.c
+++ b/src/peerinfo-tool/plugin_rest_peerinfo.c
@@ -272,7 +272,7 @@ cleanup_handle (void *cls)
272 if (NULL != handle->emsg) 272 if (NULL != handle->emsg)
273 GNUNET_free (handle->emsg); 273 GNUNET_free (handle->emsg);
274 if (NULL != handle->address) 274 if (NULL != handle->address)
275 GNUNET_free ((char*) handle->address); 275 GNUNET_free ((char *) handle->address);
276 if (NULL != handle->expiration_str) 276 if (NULL != handle->expiration_str)
277 GNUNET_free (handle->expiration_str); 277 GNUNET_free (handle->expiration_str);
278 if (NULL != handle->pubkey) 278 if (NULL != handle->pubkey)
diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c
index 6983ff2d8..06e6c0b77 100644
--- a/src/peerstore/plugin_peerstore_flat.c
+++ b/src/peerstore/plugin_peerstore_flat.c
@@ -443,7 +443,7 @@ database_setup (struct Plugin *plugin)
443 o = NULL; 443 o = NULL;
444 s = GNUNET_STRINGS_base64_decode (peer, 444 s = GNUNET_STRINGS_base64_decode (peer,
445 strlen (peer), 445 strlen (peer),
446 (void**) &o); 446 (void **) &o);
447 if (sizeof(struct GNUNET_PeerIdentity) == s) 447 if (sizeof(struct GNUNET_PeerIdentity) == s)
448 GNUNET_memcpy (&entry->peer, 448 GNUNET_memcpy (&entry->peer,
449 o, 449 o,
@@ -454,7 +454,7 @@ database_setup (struct Plugin *plugin)
454 } 454 }
455 entry->value_size = GNUNET_STRINGS_base64_decode (value, 455 entry->value_size = GNUNET_STRINGS_base64_decode (value,
456 strlen (value), 456 strlen (value),
457 (void**) &entry->value); 457 (void **) &entry->value);
458 if (GNUNET_SYSERR == 458 if (GNUNET_SYSERR ==
459 GNUNET_STRINGS_fancy_time_to_absolute (expiry, 459 GNUNET_STRINGS_fancy_time_to_absolute (expiry,
460 &entry->expiry)) 460 &entry->expiry))
@@ -496,7 +496,7 @@ store_and_free_entries (void *cls,
496 entry->value_size, 496 entry->value_size,
497 &val); 497 &val);
498 expiry = GNUNET_STRINGS_absolute_time_to_string (entry->expiry); 498 expiry = GNUNET_STRINGS_absolute_time_to_string (entry->expiry);
499 GNUNET_STRINGS_base64_encode ((char*) &entry->peer, 499 GNUNET_STRINGS_base64_encode ((char *) &entry->peer,
500 sizeof(struct GNUNET_PeerIdentity), 500 sizeof(struct GNUNET_PeerIdentity),
501 &peer); 501 &peer);
502 GNUNET_asprintf (&line, 502 GNUNET_asprintf (&line,
diff --git a/src/peerstore/test_plugin_peerstore.c b/src/peerstore/test_plugin_peerstore.c
index 03e71ed63..a4221ea63 100644
--- a/src/peerstore/test_plugin_peerstore.c
+++ b/src/peerstore/test_plugin_peerstore.c
@@ -81,7 +81,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
81 "libgnunet_plugin_peerstore_%s", 81 "libgnunet_plugin_peerstore_%s",
82 plugin_name); 82 plugin_name);
83 if (NULL == (ret = GNUNET_PLUGIN_load (libname, 83 if (NULL == (ret = GNUNET_PLUGIN_load (libname,
84 (void*) cfg))) 84 (void *) cfg)))
85 { 85 {
86 fprintf (stderr, 86 fprintf (stderr,
87 "Failed to load plugin `%s'!\n", 87 "Failed to load plugin `%s'!\n",
@@ -131,7 +131,7 @@ get_record (struct GNUNET_PEERSTORE_PluginFunctions *psp,
131 identity, 131 identity,
132 "key", 132 "key",
133 &test_record, 133 &test_record,
134 (void*) identity)); 134 (void *) identity));
135} 135}
136 136
137 137
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index 0d1a34441..f8765818b 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -885,7 +885,7 @@ handle_dns_response (void *cls,
885 GNUNET_NO); 885 GNUNET_NO);
886 GNUNET_DNS_request_answer (rc->rh, 886 GNUNET_DNS_request_answer (rc->rh,
887 mlen + sizeof(struct GNUNET_TUN_DnsHeader), 887 mlen + sizeof(struct GNUNET_TUN_DnsHeader),
888 (const void*) &msg->dns); 888 (const void *) &msg->dns);
889 GNUNET_CONTAINER_DLL_remove (exit->receive_queue_head, 889 GNUNET_CONTAINER_DLL_remove (exit->receive_queue_head,
890 exit->receive_queue_tail, 890 exit->receive_queue_tail,
891 rc); 891 rc);
@@ -1317,7 +1317,7 @@ main (int argc,
1317 NULL)) 1317 NULL))
1318 ? 0 1318 ? 0
1319 : 1; 1319 : 1;
1320 GNUNET_free ((void*) argv); 1320 GNUNET_free ((void *) argv);
1321 return ret; 1321 return ret;
1322} 1322}
1323 1323
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 96f0dc025..9bf497b16 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -599,7 +599,7 @@ identity_cb (void *cls,
599 GNUNET_assert (GNUNET_OK == 599 GNUNET_assert (GNUNET_OK ==
600 GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN, 600 GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN,
601 rd_string, 601 rd_string,
602 (void**) &rd.data, 602 (void **) &rd.data,
603 &rd.data_size)); 603 &rd.data_size));
604 rd.record_type = GNUNET_GNSRECORD_TYPE_VPN; 604 rd.record_type = GNUNET_GNSRECORD_TYPE_VPN;
605 605
@@ -611,7 +611,7 @@ identity_cb (void *cls,
611 1, &rd, 611 1, &rd,
612 &commence_testing, 612 &commence_testing,
613 NULL); 613 NULL);
614 GNUNET_free ((void**) rd.data); 614 GNUNET_free ((void **) rd.data);
615 GNUNET_free (rd_string); 615 GNUNET_free (rd_string);
616} 616}
617 617
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index 695d66144..3f8133d61 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -1538,7 +1538,7 @@ run (void *cls,
1538 abort_task = 1538 abort_task =
1539 GNUNET_SCHEDULER_add_delayed (abort_time, 1539 GNUNET_SCHEDULER_add_delayed (abort_time,
1540 &do_abort, 1540 &do_abort,
1541 (void*) __LINE__); 1541 (void *) __LINE__);
1542 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 1542 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
1543 "setup_timeout: %s\n", 1543 "setup_timeout: %s\n",
1544 GNUNET_STRINGS_relative_time_to_string (abort_time, GNUNET_YES)); 1544 GNUNET_STRINGS_relative_time_to_string (abort_time, GNUNET_YES));
diff --git a/src/rest/rest.c b/src/rest/rest.c
index 0dfd44ce7..0b86530f9 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -67,7 +67,7 @@ GNUNET_REST_create_response (const char *data)
67 else 67 else
68 len = strlen (data); 68 len = strlen (data);
69 resp = MHD_create_response_from_buffer (len, 69 resp = MHD_create_response_from_buffer (len,
70 (void*) data, 70 (void *) data,
71 MHD_RESPMEM_MUST_COPY); 71 MHD_RESPMEM_MUST_COPY);
72 return resp; 72 return resp;
73} 73}
@@ -99,7 +99,7 @@ GNUNET_REST_handle_request (struct GNUNET_REST_RequestHandle *conn,
99 if (GNUNET_NO == GNUNET_REST_namespace_match (url, handlers[i].namespace)) 99 if (GNUNET_NO == GNUNET_REST_namespace_match (url, handlers[i].namespace))
100 continue; 100 continue;
101 // Match 101 // Match
102 handlers[i].proc (conn, (const char*) url, cls); 102 handlers[i].proc (conn, (const char *) url, cls);
103 GNUNET_free (url); 103 GNUNET_free (url);
104 return GNUNET_YES; 104 return GNUNET_YES;
105 } 105 }
diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c
index 1aec5000e..d2e47da8b 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -679,7 +679,7 @@ generate_presecret_polynomial (struct KeygenSession *ks)
679 for (i = 0; i < ks->threshold; i++) 679 for (i = 0; i < ks->threshold; i++)
680 { 680 {
681 v = ks->presecret_polynomial[i] = gcry_mpi_new ( 681 v = ks->presecret_polynomial[i] = gcry_mpi_new (
682 GNUNET_SECRETSHARING_ELGAMAL_BITS); 682 GNUNET_SECRETSHARING_ELGAMAL_BITS);
683 GNUNET_assert (NULL != v); 683 GNUNET_assert (NULL != v);
684 // Randomize v such that 0 < v < elgamal_q. 684 // Randomize v such that 0 < v < elgamal_q.
685 // The '- 1' is necessary as bitlength(q) = bitlength(p) - 1. 685 // The '- 1' is necessary as bitlength(q) = bitlength(p) - 1.
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 1ae4dcdac..993cead11 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -491,7 +491,7 @@ send_bloomfilter (struct Operation *op)
491 GNUNET_assert (GNUNET_SYSERR != 491 GNUNET_assert (GNUNET_SYSERR !=
492 GNUNET_CONTAINER_bloomfilter_get_raw_data ( 492 GNUNET_CONTAINER_bloomfilter_get_raw_data (
493 op->state->local_bf, 493 op->state->local_bf,
494 (char*) &msg[1], 494 (char *) &msg[1],
495 bf_size)); 495 bf_size));
496 msg->sender_element_count = htonl (op->state->my_element_count); 496 msg->sender_element_count = htonl (op->state->my_element_count);
497 msg->bloomfilter_total_length = htonl (bf_size); 497 msg->bloomfilter_total_length = htonl (bf_size);
@@ -868,7 +868,7 @@ process_bf (struct Operation *op)
868 GNUNET_CONTAINER_multihashmap_size (op->state->my_elements)); 868 GNUNET_CONTAINER_multihashmap_size (op->state->my_elements));
869 op->state->full_result_iter 869 op->state->full_result_iter
870 = GNUNET_CONTAINER_multihashmap_iterator_create ( 870 = GNUNET_CONTAINER_multihashmap_iterator_create (
871 op->state->my_elements); 871 op->state->my_elements);
872 send_remaining_elements (op); 872 send_remaining_elements (op);
873 return; 873 return;
874 } 874 }
@@ -940,7 +940,7 @@ handle_intersection_p2p_bf (void *cls,
940 } 940 }
941 /* single part, done here immediately */ 941 /* single part, done here immediately */
942 op->state->remote_bf 942 op->state->remote_bf
943 = GNUNET_CONTAINER_bloomfilter_init ((const char*) &msg[1], 943 = GNUNET_CONTAINER_bloomfilter_init ((const char *) &msg[1],
944 bf_size, 944 bf_size,
945 bf_bits_per_element); 945 bf_bits_per_element);
946 op->state->salt = ntohl (msg->sender_mutator); 946 op->state->salt = ntohl (msg->sender_mutator);
@@ -974,7 +974,7 @@ handle_intersection_p2p_bf (void *cls,
974 } 974 }
975 } 975 }
976 GNUNET_memcpy (&op->state->bf_data[op->state->bf_data_offset], 976 GNUNET_memcpy (&op->state->bf_data[op->state->bf_data_offset],
977 (const char*) &msg[1], 977 (const char *) &msg[1],
978 chunk_size); 978 chunk_size);
979 op->state->bf_data_offset += chunk_size; 979 op->state->bf_data_offset += chunk_size;
980 if (op->state->bf_data_offset == bf_size) 980 if (op->state->bf_data_offset == bf_size)
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c
index eee0ec8d3..a59dbbd57 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -149,7 +149,7 @@ strata_estimator_insert (struct StrataEstimator *se,
149 149
150 v = key.key_val; 150 v = key.key_val;
151 /* count trailing '1'-bits of v */ 151 /* count trailing '1'-bits of v */
152 for (i = 0; v & 1; v >>= 1, i++) 152 for (i = 0; v &1; v >>= 1, i++)
153 /* empty */; 153 /* empty */;
154 ibf_insert (se->strata[i], key); 154 ibf_insert (se->strata[i], key);
155} 155}
@@ -170,7 +170,7 @@ strata_estimator_remove (struct StrataEstimator *se,
170 170
171 v = key.key_val; 171 v = key.key_val;
172 /* count trailing '1'-bits of v */ 172 /* count trailing '1'-bits of v */
173 for (i = 0; v & 1; v >>= 1, i++) 173 for (i = 0; v &1; v >>= 1, i++)
174 /* empty */; 174 /* empty */;
175 ibf_remove (se->strata[i], key); 175 ibf_remove (se->strata[i], key);
176} 176}
diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c
index be6efaedf..0af718a63 100644
--- a/src/testbed/gnunet-daemon-latency-logger.c
+++ b/src/testbed/gnunet-daemon-latency-logger.c
@@ -317,6 +317,6 @@ main (int argc, char *const *argv)
317 _ ( 317 _ (
318 "Daemon to log latency values of connections to neighbours"), 318 "Daemon to log latency values of connections to neighbours"),
319 options, &run, NULL)) ? 0 : 1; 319 options, &run, NULL)) ? 0 : 1;
320 GNUNET_free ((void*) argv); 320 GNUNET_free ((void *) argv);
321 return ret; 321 return ret;
322} 322}
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c
index 4872ea870..070583941 100644
--- a/src/testbed/gnunet-daemon-testbed-blacklist.c
+++ b/src/testbed/gnunet-daemon-testbed-blacklist.c
@@ -249,6 +249,6 @@ main (int argc, char *const *argv)
249 _ ( 249 _ (
250 "Daemon to restrict incoming transport layer connections during testbed deployments"), 250 "Daemon to restrict incoming transport layer connections during testbed deployments"),
251 options, &run, NULL)) ? 0 : 1; 251 options, &run, NULL)) ? 0 : 1;
252 GNUNET_free ((void*) argv); 252 GNUNET_free ((void *) argv);
253 return ret; 253 return ret;
254} 254}
diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c
index 2cc25b0ed..09dfee5a6 100644
--- a/src/testbed/gnunet-daemon-testbed-underlay.c
+++ b/src/testbed/gnunet-daemon-testbed-underlay.c
@@ -476,6 +476,6 @@ main (int argc, char *const *argv)
476 ( 476 (
477 "Daemon to restrict underlay network in testbed deployments"), 477 "Daemon to restrict underlay network in testbed deployments"),
478 options, &run, NULL)) ? 0 : 1; 478 options, &run, NULL)) ? 0 : 1;
479 GNUNET_free ((void*) argv); 479 GNUNET_free ((void *) argv);
480 return ret; 480 return ret;
481} 481}
diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c
index 1a513db6c..1646b8d19 100644
--- a/src/testbed/gnunet-service-testbed_meminfo.c
+++ b/src/testbed/gnunet-service-testbed_meminfo.c
@@ -105,8 +105,9 @@ typedef struct mem_table_struct
105static int 105static int
106compare_mem_table_structs (const void *a, const void *b) 106compare_mem_table_structs (const void *a, const void *b)
107{ 107{
108 return strcmp (((const mem_table_struct*) a)->name, ((const 108 return strcmp (((const mem_table_struct *) a)->name, ((const
109 mem_table_struct*) b)-> 109 mem_table_struct *) b)
110 ->
110 name); 111 name);
111} 112}
112 113
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index 975af7068..80fbf68f6 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -737,7 +737,7 @@ get_channel (struct HardwareInfos *dev, bdaddr_t dest)
737 { 737 {
738 for (it = response_list; it; it = it->next) 738 for (it = response_list; it; it = it->next)
739 { 739 {
740 sdp_record_t *record = (sdp_record_t*) it->data; 740 sdp_record_t *record = (sdp_record_t *) it->data;
741 sdp_list_t *proto_list = 0; 741 sdp_list_t *proto_list = 0;
742 if (sdp_get_access_protos (record, &proto_list) == 0) 742 if (sdp_get_access_protos (record, &proto_list) == 0)
743 { 743 {
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c
index 2d5a2cf46..83ade115b 100644
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ b/src/transport/gnunet-helper-transport-wlan.c
@@ -1086,7 +1086,7 @@ ieee80211_radiotap_iterator_init (struct
1086 * check for insanity where the present bitmaps 1086 * check for insanity where the present bitmaps
1087 * keep claiming to extend up to or even beyond the 1087 * keep claiming to extend up to or even beyond the
1088 * stated radiotap header length 1088 * stated radiotap header length
1089 */if (iterator->arg - ((uint8_t*) iterator->rtheader) > 1089 */if (iterator->arg - ((uint8_t *) iterator->rtheader) >
1090 iterator->max_length) 1090 iterator->max_length)
1091 return -1; 1091 return -1;
1092 } 1092 }
@@ -1538,7 +1538,7 @@ linux_read (struct HardwareInfos *dev,
1538 case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: 1538 case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
1539 if (! got_signal) 1539 if (! got_signal)
1540 { 1540 {
1541 ri->ri_power = *((int8_t*) iterator.this_arg); 1541 ri->ri_power = *((int8_t *) iterator.this_arg);
1542 got_signal = 1; 1542 got_signal = 1;
1543 } 1543 }
1544 break; 1544 break;
@@ -1546,7 +1546,7 @@ linux_read (struct HardwareInfos *dev,
1546 case IEEE80211_RADIOTAP_DB_ANTSIGNAL: 1546 case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
1547 if (! got_signal) 1547 if (! got_signal)
1548 { 1548 {
1549 ri->ri_power = *((int8_t*) iterator.this_arg); 1549 ri->ri_power = *((int8_t *) iterator.this_arg);
1550 got_signal = 1; 1550 got_signal = 1;
1551 } 1551 }
1552 break; 1552 break;
@@ -1554,7 +1554,7 @@ linux_read (struct HardwareInfos *dev,
1554 case IEEE80211_RADIOTAP_DBM_ANTNOISE: 1554 case IEEE80211_RADIOTAP_DBM_ANTNOISE:
1555 if (! got_noise) 1555 if (! got_noise)
1556 { 1556 {
1557 ri->ri_noise = *((int8_t*) iterator.this_arg); 1557 ri->ri_noise = *((int8_t *) iterator.this_arg);
1558 got_noise = 1; 1558 got_noise = 1;
1559 } 1559 }
1560 break; 1560 break;
@@ -1562,7 +1562,7 @@ linux_read (struct HardwareInfos *dev,
1562 case IEEE80211_RADIOTAP_DB_ANTNOISE: 1562 case IEEE80211_RADIOTAP_DB_ANTNOISE:
1563 if (! got_noise) 1563 if (! got_noise)
1564 { 1564 {
1565 ri->ri_noise = *((int8_t*) iterator.this_arg); 1565 ri->ri_noise = *((int8_t *) iterator.this_arg);
1566 got_noise = 1; 1566 got_noise = 1;
1567 } 1567 }
1568 break; 1568 break;
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index d831a7b78..17d72135b 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -1923,7 +1923,7 @@ handle_helper_message (void *cls,
1923 mas.session = NULL; 1923 mas.session = NULL;
1924 (void) GNUNET_SERVER_mst_receive (plugin->helper_payload_tokenizer, 1924 (void) GNUNET_SERVER_mst_receive (plugin->helper_payload_tokenizer,
1925 &mas, 1925 &mas,
1926 (const char*) &rxinfo[1], 1926 (const char *) &rxinfo[1],
1927 msize - sizeof(struct 1927 msize - sizeof(struct
1928 GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage), 1928 GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage),
1929 GNUNET_YES, GNUNET_NO); 1929 GNUNET_YES, GNUNET_NO);
diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c
index 97ff01680..c089b29db 100644
--- a/src/util/crypto_abe.c
+++ b/src/util/crypto_abe.c
@@ -55,7 +55,7 @@ init_aes (element_t k, int enc,
55 unsigned char*key_buf; 55 unsigned char*key_buf;
56 56
57 key_len = element_length_in_bytes (k) < 33 ? 3 : element_length_in_bytes (k); 57 key_len = element_length_in_bytes (k) < 33 ? 3 : element_length_in_bytes (k);
58 key_buf = (unsigned char*) malloc (key_len); 58 key_buf = (unsigned char *) malloc (key_len);
59 element_to_bytes (key_buf, k); 59 element_to_bytes (key_buf, k);
60 60
61 GNUNET_memcpy (key->aes_key, 61 GNUNET_memcpy (key->aes_key,
@@ -219,15 +219,15 @@ write_cpabe (void **result,
219 219
220 *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len); 220 *result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len);
221 ptr = *result; 221 ptr = *result;
222 len = (uint32_t*) ptr; 222 len = (uint32_t *) ptr;
223 *len = htonl (file_len); 223 *len = htonl (file_len);
224 ptr += 4; 224 ptr += 4;
225 len = (uint32_t*) ptr; 225 len = (uint32_t *) ptr;
226 *len = htonl (aes_buf_len); 226 *len = htonl (aes_buf_len);
227 ptr += 4; 227 ptr += 4;
228 GNUNET_memcpy (ptr, aes_buf, aes_buf_len); 228 GNUNET_memcpy (ptr, aes_buf, aes_buf_len);
229 ptr += aes_buf_len; 229 ptr += aes_buf_len;
230 len = (uint32_t*) ptr; 230 len = (uint32_t *) ptr;
231 *len = htonl (cph_buf_len); 231 *len = htonl (cph_buf_len);
232 ptr += 4; 232 ptr += 4;
233 GNUNET_memcpy (ptr, cph_buf, cph_buf_len); 233 GNUNET_memcpy (ptr, cph_buf, cph_buf_len);
@@ -246,17 +246,17 @@ read_cpabe (const void *data,
246 char *ptr; 246 char *ptr;
247 uint32_t *len; 247 uint32_t *len;
248 248
249 ptr = (char*) data; 249 ptr = (char *) data;
250 len = (uint32_t*) ptr; 250 len = (uint32_t *) ptr;
251 buf_len = ntohl (*len); 251 buf_len = ntohl (*len);
252 ptr += 4; 252 ptr += 4;
253 len = (uint32_t*) ptr; 253 len = (uint32_t *) ptr;
254 *aes_buf_len = ntohl (*len); 254 *aes_buf_len = ntohl (*len);
255 ptr += 4; 255 ptr += 4;
256 *aes_buf = GNUNET_malloc (*aes_buf_len); 256 *aes_buf = GNUNET_malloc (*aes_buf_len);
257 GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len); 257 GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len);
258 ptr += *aes_buf_len; 258 ptr += *aes_buf_len;
259 len = (uint32_t*) ptr; 259 len = (uint32_t *) ptr;
260 *cph_buf_len = ntohl (*len); 260 *cph_buf_len = ntohl (*len);
261 ptr += 4; 261 ptr += 4;
262 *cph_buf = GNUNET_malloc (*cph_buf_len); 262 *cph_buf = GNUNET_malloc (*cph_buf_len);
@@ -282,7 +282,7 @@ GNUNET_CRYPTO_cpabe_encrypt (const void *block,
282 int aes_buf_len; 282 int aes_buf_len;
283 ssize_t result_len; 283 ssize_t result_len;
284 284
285 if (! (cph = gabe_enc (key->pub, m, (char*) policy))) 285 if (! (cph = gabe_enc (key->pub, m, (char *) policy)))
286 return GNUNET_SYSERR; 286 return GNUNET_SYSERR;
287 cph_buf_len = gabe_cph_serialize (cph, 287 cph_buf_len = gabe_cph_serialize (cph,
288 &cph_buf); 288 &cph_buf);
@@ -329,7 +329,7 @@ GNUNET_CRYPTO_cpabe_decrypt (const void *block,
329 } 329 }
330 gabe_cph_free (cph); 330 gabe_cph_free (cph);
331 GNUNET_free (cph); 331 GNUNET_free (cph);
332 plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char**) result); 332 plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char **) result);
333 GNUNET_free (cph_buf); 333 GNUNET_free (cph_buf);
334 GNUNET_free (aes_buf); 334 GNUNET_free (aes_buf);
335 element_clear (m); 335 element_clear (m);
diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c
index 6b0dc3503..408d64e58 100644
--- a/src/util/crypto_ecc_dlog.c
+++ b/src/util/crypto_ecc_dlog.c
@@ -189,7 +189,7 @@ GNUNET_CRYPTO_ecc_dlog_prepare (unsigned int max,
189 GNUNET_assert (GNUNET_OK == 189 GNUNET_assert (GNUNET_OK ==
190 GNUNET_CONTAINER_multipeermap_put (edc->map, 190 GNUNET_CONTAINER_multipeermap_put (edc->map,
191 &key, 191 &key,
192 (void*) (long) i + max, 192 (void *) (long) i + max,
193 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); 193 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
194 } 194 }
195 /* negative values */ 195 /* negative values */
@@ -203,7 +203,7 @@ GNUNET_CRYPTO_ecc_dlog_prepare (unsigned int max,
203 GNUNET_assert (GNUNET_OK == 203 GNUNET_assert (GNUNET_OK ==
204 GNUNET_CONTAINER_multipeermap_put (edc->map, 204 GNUNET_CONTAINER_multipeermap_put (edc->map,
205 &key, 205 &key,
206 (void*) (long) max - i, 206 (void *) (long) max - i,
207 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); 207 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
208 } 208 }
209 gcry_mpi_release (fact); 209 gcry_mpi_release (fact);
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 2bf03db58..c41c419ff 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -105,7 +105,7 @@ GNUNET_CRYPTO_hash_from_string2 (const char *enc,
105 GNUNET_STRINGS_utf8_toupper (enc, up_ptr); 105 GNUNET_STRINGS_utf8_toupper (enc, up_ptr);
106 106
107 return GNUNET_STRINGS_string_to_data (upper_enc, enclen, 107 return GNUNET_STRINGS_string_to_data (upper_enc, enclen,
108 (unsigned char*) result, 108 (unsigned char *) result,
109 sizeof(struct GNUNET_HashCode)); 109 sizeof(struct GNUNET_HashCode));
110} 110}
111 111
@@ -439,7 +439,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
439 const void *plaintext, size_t plaintext_len, 439 const void *plaintext, size_t plaintext_len,
440 struct GNUNET_HashCode *hmac) 440 struct GNUNET_HashCode *hmac)
441{ 441{
442 GNUNET_CRYPTO_hmac_raw ((void*) key->key, sizeof(key->key), 442 GNUNET_CRYPTO_hmac_raw ((void *) key->key, sizeof(key->key),
443 plaintext, plaintext_len, 443 plaintext, plaintext_len,
444 hmac); 444 hmac);
445} 445}
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index d2f3acd45..6a602c64e 100644
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
178 GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]", 178 GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]",
179 gettext_noop ("Use build-in GNUnet stub resolver"), 179 gettext_noop ("Use build-in GNUnet stub resolver"),
180 options, &run, NULL)) ? 0 : 1; 180 options, &run, NULL)) ? 0 : 1;
181 GNUNET_free ((void*) argv); 181 GNUNET_free ((void *) argv);
182 return ret; 182 return ret;
183} 183}
184 184
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index 2f5efa198..e6d83d52c 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -207,7 +207,7 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
207 */ 207 */
208#define LOG_MAX_LINE_LENGTH (17) 208#define LOG_MAX_LINE_LENGTH (17)
209 209
210#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES *LOG_MAX_LINE_LENGTH 210#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES * LOG_MAX_LINE_LENGTH
211 211
212static char buf[LOG_BUFFER_SIZE]; 212static char buf[LOG_BUFFER_SIZE];
213 213
@@ -238,7 +238,7 @@ read_call (void *cls)
238 read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, 238 read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
239 stdout_read_handle, 239 stdout_read_handle,
240 &read_call, 240 &read_call,
241 (void*) stdout_read_handle); 241 (void *) stdout_read_handle);
242 return; 242 return;
243 } 243 }
244 244
@@ -430,7 +430,7 @@ runone ()
430 read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, 430 read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
431 stdout_read_handle, 431 stdout_read_handle,
432 &read_call, 432 &read_call,
433 (void*) stdout_read_handle); 433 (void *) stdout_read_handle);
434} 434}
435 435
436 436
diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index f7e0596eb..c5a703db4 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -193,7 +193,7 @@ main (int argc, char *argv[])
193 "-o", "BatchMode yes", 193 "-o", "BatchMode yes",
194 "-o", "UserKnownHostsFile /tmp/gnunet_test_socks_ssh_garbage", 194 "-o", "UserKnownHostsFile /tmp/gnunet_test_socks_ssh_garbage",
195 "-o", "StrictHostKeyChecking no", 195 "-o", "StrictHostKeyChecking no",
196 "127.0.0.1", "-N", (char*) NULL); 196 "127.0.0.1", "-N", (char *) NULL);
197 perror ( 197 perror (
198 "execlp (\"ssh\",\"ssh\",...,\"-D\",\"1081\",\"127.0.0.1\",\"-N\") "); 198 "execlp (\"ssh\",\"ssh\",...,\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
199 printf ("" 199 printf (""