[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: fix pointer indentation
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: fix pointer indentation |
|
Date: |
Sun, 24 Nov 2019 19:15:49 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new d17a17ea7 fix pointer indentation
d17a17ea7 is described below
commit d17a17ea785f91c18b5694eab3372c4e4564d95e
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Nov 24 19:13:00 2019 +0100
fix pointer indentation
---
src/abe/abe.c | 20 ++++++++---------
src/abe/test_cpabe.c | 4 ++--
src/auction/gnunet-auction-create.c | 2 +-
src/auction/gnunet-auction-info.c | 2 +-
src/auction/gnunet-auction-join.c | 2 +-
src/conversation/gnunet-conversation-test.c | 2 +-
src/conversation/gnunet_gst_test.c | 2 +-
src/dns/dns_api.c | 2 +-
src/dns/gnunet-dns-monitor.c | 2 +-
src/dns/gnunet-dns-redirector.c | 2 +-
src/exit/gnunet-daemon-exit.c | 2 +-
src/exit/gnunet-helper-exit.c | 26 +++++++++++++---------
src/fs/gnunet-fs-profiler.c | 2 +-
src/gns/gns_api.c | 4 ++--
src/gns/gnunet-dns2gns.c | 4 ++--
src/gns/gnunet-gns-benchmark.c | 2 +-
src/gns/gnunet-gns-import.c | 2 +-
src/gns/gnunet-gns-proxy.c | 2 +-
src/gns/gnunet-service-gns.c | 2 +-
src/gns/gnunet-service-gns_interceptor.c | 4 ++--
src/gns/nss/nss_gns.c | 10 ++++-----
src/hostlist/gnunet-daemon-hostlist.c | 2 +-
src/include/gauger.h | 12 +++++-----
src/include/gnunet_bio_lib.h | 4 ++--
src/include/gnunet_common.h | 2 +-
src/include/gnunet_mq_lib.h | 6 ++---
src/include/platform.h | 4 ++--
src/json/json_gnsrecord.c | 2 +-
src/json/json_helper.c | 4 ++--
src/namecache/plugin_namecache_flat.c | 6 ++---
src/namecache/test_plugin_namecache.c | 2 +-
src/namestore/gnunet-namestore-fcfsd.c | 2 +-
src/namestore/plugin_namestore_flat.c | 4 ++--
src/peerinfo-tool/plugin_rest_peerinfo.c | 2 +-
src/peerstore/plugin_peerstore_flat.c | 6 ++---
src/peerstore/test_plugin_peerstore.c | 4 ++--
src/pt/gnunet-daemon-pt.c | 4 ++--
src/pt/test_gns_vpn.c | 4 ++--
src/regex/gnunet-regex-profiler.c | 2 +-
src/rest/rest.c | 4 ++--
src/secretsharing/gnunet-service-secretsharing.c | 2 +-
src/set/gnunet-service-set_intersection.c | 8 +++----
.../gnunet-service-set_union_strata_estimator.c | 4 ++--
src/testbed/gnunet-daemon-latency-logger.c | 2 +-
src/testbed/gnunet-daemon-testbed-blacklist.c | 2 +-
src/testbed/gnunet-daemon-testbed-underlay.c | 2 +-
src/testbed/gnunet-service-testbed_meminfo.c | 5 +++--
src/transport/gnunet-helper-transport-bluetooth.c | 2 +-
src/transport/gnunet-helper-transport-wlan.c | 10 ++++-----
src/transport/plugin_transport_wlan.c | 2 +-
src/util/crypto_abe.c | 20 ++++++++---------
src/util/crypto_ecc_dlog.c | 4 ++--
src/util/crypto_hash.c | 4 ++--
src/util/gnunet-resolver.c | 2 +-
src/util/test_common_logging_runtime_loglevels.c | 6 ++---
src/util/test_socks.c | 2 +-
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,
unsigned char*key_buf;
key_len = element_length_in_bytes (k) < 33 ? 3 : element_length_in_bytes (k);
- key_buf = (unsigned char*) malloc (key_len);
+ key_buf = (unsigned char *) malloc (key_len);
element_to_bytes (key_buf, k);
GNUNET_memcpy (key->aes_key, key_buf, GNUNET_CRYPTO_AES_KEY_LENGTH);
@@ -247,15 +247,15 @@ write_cpabe (void **result,
*result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len);
ptr = *result;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*len = htonl (file_len);
ptr += 4;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*len = htonl (aes_buf_len);
ptr += 4;
GNUNET_memcpy (ptr, aes_buf, aes_buf_len);
ptr += aes_buf_len;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*len = htonl (cph_buf_len);
ptr += 4;
GNUNET_memcpy (ptr, cph_buf, cph_buf_len);
@@ -274,17 +274,17 @@ read_cpabe (const void *data,
char *ptr;
uint32_t *len;
- ptr = (char*) data;
- len = (uint32_t*) ptr;
+ ptr = (char *) data;
+ len = (uint32_t *) ptr;
buf_len = ntohl (*len);
ptr += 4;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*aes_buf_len = ntohl (*len);
ptr += 4;
*aes_buf = GNUNET_malloc (*aes_buf_len);
GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len);
ptr += *aes_buf_len;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*cph_buf_len = ntohl (*len);
ptr += 4;
*cph_buf = GNUNET_malloc (*cph_buf_len);
@@ -321,7 +321,7 @@ GNUNET_ABE_cpabe_encrypt (const void *block,
int aes_buf_len;
ssize_t result_len;
- if (! (cph = gabe_enc (key->pub, m, (char*) policy)))
+ if (! (cph = gabe_enc (key->pub, m, (char *) policy)))
return GNUNET_SYSERR;
cph_buf_len = gabe_cph_serialize (cph,
&cph_buf);
@@ -378,7 +378,7 @@ GNUNET_ABE_cpabe_decrypt (const void *block,
}
gabe_cph_free (cph);
GNUNET_free (cph);
- plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char**) result);
+ plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char **) result);
GNUNET_free (cph_buf);
GNUNET_free (aes_buf);
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 ()
size = GNUNET_ABE_cpabe_encrypt (TESTSTRING, strlen (TESTSTRING) + 1,
"testattr", // Policy
msk,
- (void*) &result);
+ (void *) &result);
GNUNET_assert (-1 != size);
attrs = GNUNET_malloc (2 * sizeof(char*));
attrs[0] = "testattr";
@@ -53,7 +53,7 @@ testAbecipher ()
size = GNUNET_ABE_cpabe_decrypt (result, size,
key,
- (void*) &res);
+ (void *) &res);
if (strlen (TESTSTRING) + 1 != size)
{
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)
options,
&run,
NULL)) ? ret : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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)
options,
&run,
NULL)) ? ret : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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)
options,
&run,
NULL)) ? ret : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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,
options,
&run,
NULL)) ? ret : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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[])
// GstPipeline *pipeline;
- gst = (GNUNET_gstData*) malloc (sizeof(struct GNUNET_gstData));
+ gst = (GNUNET_gstData *) malloc (sizeof(struct GNUNET_gstData));
// gst->audio_message.header.type = htons
(GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO);
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,
dh->rh (dh->rh_cls,
rh,
payload_length,
- (const char*) &req[1]);
+ (const char *) &req[1]);
}
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)
gettext_noop
("Monitor DNS queries."), options,
&run, NULL)) ? ret : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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)
("Change DNS replies to point elsewhere."),
options,
&run, NULL)) ? ret : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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,
sizeof(struct GNUNET_HashCode));
/* the GNUnet hashmap only uses the first sizeof(unsigned int) of the hash,
so we put the IP address in there (and hope for few collisions) */
- off = (char*) hash;
+ off = (char *) hash;
switch (ri->remote_address.af)
{
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;
static const char *sbin_iptables;
-#if !defined(_LINUX_IN6_H) && defined(__linux__)
+#if ! defined(_LINUX_IN6_H) && defined(__linux__)
/**
* This is in linux/include/net/ipv6.h, but not always exported.
*/
@@ -234,32 +234,36 @@ init_tun (char *dev)
strcpy (dev, ifr.ifr_name);
return fd;
}
+
+
#else /* BSD et al, including DARWIN */
#ifdef SIOCIFCREATE
static int
-init_tun(char *dev)
+init_tun (char *dev)
{
int fd;
int s;
struct ifreq ifr;
- fd = open(dev, O_RDWR);
- if(fd == -1)
+ fd = open (dev, O_RDWR);
+ if (fd == -1)
{
- s = socket(AF_INET, SOCK_DGRAM, 0);
+ s = socket (AF_INET, SOCK_DGRAM, 0);
if (s < 0)
return -1;
- memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, dev + 5, sizeof(ifr.ifr_name) - 1);
- if (!ioctl(s, SIOCIFCREATE, &ifr))
- fd = open(dev, O_RDWR);
- close(s);
+ memset (&ifr, 0, sizeof(ifr));
+ strncpy (ifr.ifr_name, dev + 5, sizeof(ifr.ifr_name) - 1);
+ if (! ioctl (s, SIOCIFCREATE, &ifr))
+ fd = open (dev, O_RDWR);
+ close (s);
}
return fd;
}
+
+
#else
-#define init_tun(dev) open(dev, O_RDWR)
+#define init_tun(dev) open (dev, O_RDWR)
#endif
#endif /* !IFF_TUN (BSD) */
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)
"run a testbed to measure file-sharing
performance"),
options, &run,
NULL)) ? ret : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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,
(void) cls;
if (GNUNET_SYSERR ==
GNUNET_GNSRECORD_records_deserialize (mlen,
- (const char*) &lookup_msg[1],
+ (const char *) &lookup_msg[1],
rd_count,
rd))
{
@@ -203,7 +203,7 @@ handle_result (void *cls,
GNUNET_assert (GNUNET_OK ==
GNUNET_GNSRECORD_records_deserialize (mlen,
(const
- char*) &lookup_msg[1],
+ char *) &lookup_msg[1],
rd_count,
rd));
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,
/* for a another query, ignore */
return;
}
- request->packet = GNUNET_DNSPARSER_parse ((char*) dns,
+ request->packet = GNUNET_DNSPARSER_parse ((char *) dns,
r);
GNUNET_DNSSTUB_resolve_cancel (request->dns_lookup);
send_response (request);
@@ -775,7 +775,7 @@ main (int argc,
_ ("GNUnet DNS-to-GNS proxy (a DNS server)"),
options,
&run, NULL)) ? 0 : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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,
&run,
NULL))
ret = 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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)
"This program will import some GNS authorities
into your GNS namestore."),
options,
&run, NULL);
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return GNUNET_OK == r ? ret : 1;
}
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)
+ alen + sizeof(uint16_t))
return; /* need more data */
dom_name = (const char *) &dom_len[1];
- port = (const uint16_t*) &dom_name[*dom_len];
+ port = (const uint16_t *) &dom_name[*dom_len];
s5r->domain = GNUNET_strndup (dom_name,
*dom_len);
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,
GNUNET_GNSRECORD_records_serialize (rd_count,
rd,
len,
- (char*) &rmsg[1]));
+ (char *) &rmsg[1]));
GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (gc->client),
env);
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,
default:
answer_records[i - skip_answers].data.raw.data_len = rd[i].data_size;
- answer_records[i - skip_answers].data.raw.data = (char*) rd[i].data;
+ answer_records[i - skip_answers].data.raw.data = (char *) rd[i].data;
break;
}
GNUNET_break (0 == (rd[i - skip_answers].flags
@@ -244,7 +244,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
additional_records[i - skip_additional].data.raw.data_len =
rd[i].data_size;
additional_records[i - skip_additional].data.raw.data =
- (char*) rd[i].data;
+ (char *) rd[i].data;
break;
}
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,
goto finish;
}
/* Alias names */
- *((char**) buffer) = NULL;
- result->h_aliases = (char**) buffer;
+ *((char **) buffer) = NULL;
+ result->h_aliases = (char **) buffer;
idx = sizeof(char*);
/* Official name */
@@ -175,9 +175,9 @@ _nss_gns_gethostbyname2_r (const char *name,
/* Address array address_length is always a multiple of 32bits */
for (i = 0; i < u.count; i++)
- ((char**) (buffer + idx))[i] = buffer + astart + address_length * i;
- ((char**) (buffer + idx))[i] = NULL;
- result->h_addr_list = (char**) (buffer + idx);
+ ((char **) (buffer + idx))[i] = buffer + astart + address_length * i;
+ ((char **) (buffer + idx))[i] = NULL;
+ result->h_addr_list = (char **) (buffer + idx);
status = NSS_STATUS_SUCCESS;
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)
_ ("GNUnet hostlist server and client"),
options,
&run, NULL)) ? 0 : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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 @@
sprintf (__gauger_s, "%Lf", (long double) (value)); \
__gauger_v[0] = "gauger"; \
__gauger_v[1] = "-n"; \
- __gauger_v[2] = (char*) (counter); \
+ __gauger_v[2] = (char *) (counter); \
__gauger_v[3] = "-d"; \
__gauger_v[4] = __gauger_s; \
__gauger_v[5] = "-u"; \
- __gauger_v[6] = (char*) (unit); \
+ __gauger_v[6] = (char *) (unit); \
__gauger_v[7] = "-c"; \
- __gauger_v[8] = (char*) (category); \
- __gauger_v[9] = (char*) NULL; \
+ __gauger_v[8] = (char *) (category); \
+ __gauger_v[9] = (char *) NULL; \
execvp ("gauger", __gauger_v); \
_exit (1); \
}else{ \
@@ -57,11 +57,11 @@
sprintf (__gauger_s, "%Lf", (long double) (value)); \
__gauger_v[0] = "gauger"; \
__gauger_v[1] = "-n"; \
- __gauger_v[2] = (char*) (counter); \
+ __gauger_v[2] = (char *) (counter); \
__gauger_v[3] = "-d"; \
__gauger_v[4] = __gauger_s; \
__gauger_v[5] = "-u"; \
- __gauger_v[6] = (char*) (unit); \
+ __gauger_v[6] = (char *) (unit); \
__gauger_v[7] = "-i"; \
__gauger_v[8] = id; \
__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,
*/
#define GNUNET_BIO_read_int32(h, i) GNUNET_BIO_read_int32__ (h, __FILE__, \
__LINE__, \
- (int32_t*) i)
+ (int32_t *) i)
/**
@@ -194,7 +194,7 @@ GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h,
const char *file,
*/
#define GNUNET_BIO_read_int64(h, i) GNUNET_BIO_read_int64__ (h, __FILE__, \
__LINE__, \
- (int64_t*) i)
+ (int64_t *) i)
/**
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);
*/
#define GNUNET_is_zero(a) \
({ \
- static const typeof (*a) _z; \
+ static const typeof (*a)_z; \
memcmp ((a), &_z, sizeof(_z)); \
})
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
*/
#define GNUNET_MQ_hd_fixed_size(name, code, str, ctx) \
({ \
- void (*_cb)(void *cls, const str *msg) = &handle_ ## name; \
+ void (*_cb)(void *cls, const str * msg) = &handle_ ## name; \
((struct GNUNET_MQ_MessageHandler){ NULL, \
(GNUNET_MQ_MessageCallback) _cb, \
(ctx), \
@@ -598,8 +598,8 @@ struct GNUNET_MQ_MessageHandler
*/
#define GNUNET_MQ_hd_var_size(name, code, str, ctx) \
__extension__ ({ \
- int (*_mv)(void *cls, const str *msg) = &check_ ## name; \
- void (*_cb)(void *cls, const str *msg) = &handle_ ## name; \
+ int (*_mv)(void *cls, const str * msg) = &check_ ## name;
\
+ void (*_cb)(void *cls, const str * msg) = &handle_ ## name;
\
((struct GNUNET_MQ_MessageHandler){ (GNUNET_MQ_MessageValidationCallback) \
_mv, \
(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);
#if defined(__sparc__)
-#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove (&__tmp,
&(val), \
-
sizeof((val))); \
+#define MAKE_UNALIGNED(val) ({ __typeof__((val))__tmp; memmove (&__tmp,
&(val), \
+
sizeof((val))); \
__tmp; })
#else
#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)
}
if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (rd->record_type,
value,
- (void**) &rd->data,
+ (void **) &rd->data,
&rd->data_size))
{
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,
GNUNET_free (data);
return GNUNET_SYSERR;
}
- *(void**) spec->ptr = data;
+ *(void **) spec->ptr = data;
*spec->size_ptr = size;
return GNUNET_OK;
}
@@ -171,7 +171,7 @@ clean_variable_data (void *cls,
if (0 != *spec->size_ptr)
{
GNUNET_free (*(void **) spec->ptr);
- *(void**) spec->ptr = NULL;
+ *(void **) spec->ptr = NULL;
*spec->size_ptr = 0;
}
}
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)
&entry->query));
GNUNET_STRINGS_base64_decode (block,
strlen (block),
- (void**) &block_buffer);
+ (void **) &block_buffer);
entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer;
if (GNUNET_OK !=
GNUNET_CONTAINER_multihashmap_put (plugin->hm,
@@ -211,14 +211,14 @@ store_and_free_entries (void *cls,
+ sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey)
+ sizeof(struct GNUNET_CRYPTO_EcdsaSignature);
- GNUNET_STRINGS_base64_encode ((char*) entry->block,
+ GNUNET_STRINGS_base64_encode ((char *) entry->block,
block_size,
&block_b64);
GNUNET_CRYPTO_hash_to_enc (&entry->query,
&query);
GNUNET_asprintf (&line,
"%s,%s\n",
- (char*) &query,
+ (char *) &query,
block_b64);
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)
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("Loading `%s' namecache plugin\n"),
plugin_name);
GNUNET_asprintf (&libname, "libgnunet_plugin_namecache_%s", plugin_name);
- if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void*) cfg)))
+ if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void *) cfg)))
{
fprintf (stderr, "Failed to load plugin `%s'!\n", plugin_name);
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,
"GNU Name System First Come First Serve name
registration service"),
options,
&run, NULL)) ? 0 : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
GNUNET_CRYPTO_ecdsa_key_clear (&fcfs_zone_pkey);
return ret;
}
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)
GNUNET_STRINGS_base64_decode (zone_private_key,
strlen (zone_private_key),
- (void**) &private_key);
+ (void **) &private_key);
entry->private_key = *private_key;
GNUNET_free (private_key);
}
@@ -494,7 +494,7 @@ namestore_flat_store_records (void *cls,
entry->record_data[i].flags = rd[i].flags;
entry->record_data[i].data_size = rd[i].data_size;
entry->record_data[i].data = GNUNET_malloc (rd[i].data_size);
- GNUNET_memcpy ((char*) entry->record_data[i].data,
+ GNUNET_memcpy ((char *) entry->record_data[i].data,
rd[i].data,
rd[i].data_size);
}
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)
if (NULL != handle->emsg)
GNUNET_free (handle->emsg);
if (NULL != handle->address)
- GNUNET_free ((char*) handle->address);
+ GNUNET_free ((char *) handle->address);
if (NULL != handle->expiration_str)
GNUNET_free (handle->expiration_str);
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)
o = NULL;
s = GNUNET_STRINGS_base64_decode (peer,
strlen (peer),
- (void**) &o);
+ (void **) &o);
if (sizeof(struct GNUNET_PeerIdentity) == s)
GNUNET_memcpy (&entry->peer,
o,
@@ -454,7 +454,7 @@ database_setup (struct Plugin *plugin)
}
entry->value_size = GNUNET_STRINGS_base64_decode (value,
strlen (value),
- (void**)
&entry->value);
+ (void **)
&entry->value);
if (GNUNET_SYSERR ==
GNUNET_STRINGS_fancy_time_to_absolute (expiry,
&entry->expiry))
@@ -496,7 +496,7 @@ store_and_free_entries (void *cls,
entry->value_size,
&val);
expiry = GNUNET_STRINGS_absolute_time_to_string (entry->expiry);
- GNUNET_STRINGS_base64_encode ((char*) &entry->peer,
+ GNUNET_STRINGS_base64_encode ((char *) &entry->peer,
sizeof(struct GNUNET_PeerIdentity),
&peer);
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)
"libgnunet_plugin_peerstore_%s",
plugin_name);
if (NULL == (ret = GNUNET_PLUGIN_load (libname,
- (void*) cfg)))
+ (void *) cfg)))
{
fprintf (stderr,
"Failed to load plugin `%s'!\n",
@@ -131,7 +131,7 @@ get_record (struct GNUNET_PEERSTORE_PluginFunctions *psp,
identity,
"key",
&test_record,
- (void*) identity));
+ (void *) identity));
}
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,
GNUNET_NO);
GNUNET_DNS_request_answer (rc->rh,
mlen + sizeof(struct GNUNET_TUN_DnsHeader),
- (const void*) &msg->dns);
+ (const void *) &msg->dns);
GNUNET_CONTAINER_DLL_remove (exit->receive_queue_head,
exit->receive_queue_tail,
rc);
@@ -1317,7 +1317,7 @@ main (int argc,
NULL))
? 0
: 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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,
GNUNET_assert (GNUNET_OK ==
GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN,
rd_string,
- (void**) &rd.data,
+ (void **) &rd.data,
&rd.data_size));
rd.record_type = GNUNET_GNSRECORD_TYPE_VPN;
@@ -611,7 +611,7 @@ identity_cb (void *cls,
1, &rd,
&commence_testing,
NULL);
- GNUNET_free ((void**) rd.data);
+ GNUNET_free ((void **) rd.data);
GNUNET_free (rd_string);
}
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,
abort_task =
GNUNET_SCHEDULER_add_delayed (abort_time,
&do_abort,
- (void*) __LINE__);
+ (void *) __LINE__);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"setup_timeout: %s\n",
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)
else
len = strlen (data);
resp = MHD_create_response_from_buffer (len,
- (void*) data,
+ (void *) data,
MHD_RESPMEM_MUST_COPY);
return resp;
}
@@ -99,7 +99,7 @@ GNUNET_REST_handle_request (struct GNUNET_REST_RequestHandle
*conn,
if (GNUNET_NO == GNUNET_REST_namespace_match (url, handlers[i].namespace))
continue;
// Match
- handlers[i].proc (conn, (const char*) url, cls);
+ handlers[i].proc (conn, (const char *) url, cls);
GNUNET_free (url);
return GNUNET_YES;
}
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)
for (i = 0; i < ks->threshold; i++)
{
v = ks->presecret_polynomial[i] = gcry_mpi_new (
- GNUNET_SECRETSHARING_ELGAMAL_BITS);
+ GNUNET_SECRETSHARING_ELGAMAL_BITS);
GNUNET_assert (NULL != v);
// Randomize v such that 0 < v < elgamal_q.
// 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)
GNUNET_assert (GNUNET_SYSERR !=
GNUNET_CONTAINER_bloomfilter_get_raw_data (
op->state->local_bf,
- (char*) &msg[1],
+ (char *) &msg[1],
bf_size));
msg->sender_element_count = htonl (op->state->my_element_count);
msg->bloomfilter_total_length = htonl (bf_size);
@@ -868,7 +868,7 @@ process_bf (struct Operation *op)
GNUNET_CONTAINER_multihashmap_size (op->state->my_elements));
op->state->full_result_iter
= GNUNET_CONTAINER_multihashmap_iterator_create (
- op->state->my_elements);
+ op->state->my_elements);
send_remaining_elements (op);
return;
}
@@ -940,7 +940,7 @@ handle_intersection_p2p_bf (void *cls,
}
/* single part, done here immediately */
op->state->remote_bf
- = GNUNET_CONTAINER_bloomfilter_init ((const char*) &msg[1],
+ = GNUNET_CONTAINER_bloomfilter_init ((const char *) &msg[1],
bf_size,
bf_bits_per_element);
op->state->salt = ntohl (msg->sender_mutator);
@@ -974,7 +974,7 @@ handle_intersection_p2p_bf (void *cls,
}
}
GNUNET_memcpy (&op->state->bf_data[op->state->bf_data_offset],
- (const char*) &msg[1],
+ (const char *) &msg[1],
chunk_size);
op->state->bf_data_offset += chunk_size;
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,
v = key.key_val;
/* count trailing '1'-bits of v */
- for (i = 0; v & 1; v >>= 1, i++)
+ for (i = 0; v &1; v >>= 1, i++)
/* empty */;
ibf_insert (se->strata[i], key);
}
@@ -170,7 +170,7 @@ strata_estimator_remove (struct StrataEstimator *se,
v = key.key_val;
/* count trailing '1'-bits of v */
- for (i = 0; v & 1; v >>= 1, i++)
+ for (i = 0; v &1; v >>= 1, i++)
/* empty */;
ibf_remove (se->strata[i], key);
}
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)
_ (
"Daemon to log latency values of connections to
neighbours"),
options, &run, NULL)) ? 0 : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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)
_ (
"Daemon to restrict incoming transport layer
connections during testbed deployments"),
options, &run, NULL)) ? 0 : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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)
(
"Daemon to restrict underlay network in testbed
deployments"),
options, &run, NULL)) ? 0 : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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
static int
compare_mem_table_structs (const void *a, const void *b)
{
- return strcmp (((const mem_table_struct*) a)->name, ((const
- mem_table_struct*) b)->
+ return strcmp (((const mem_table_struct *) a)->name, ((const
+ mem_table_struct *) b)
+ ->
name);
}
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)
{
for (it = response_list; it; it = it->next)
{
- sdp_record_t *record = (sdp_record_t*) it->data;
+ sdp_record_t *record = (sdp_record_t *) it->data;
sdp_list_t *proto_list = 0;
if (sdp_get_access_protos (record, &proto_list) == 0)
{
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
* check for insanity where the present bitmaps
* keep claiming to extend up to or even beyond the
* stated radiotap header length
- */if (iterator->arg - ((uint8_t*) iterator->rtheader) >
+ */if (iterator->arg - ((uint8_t *) iterator->rtheader) >
iterator->max_length)
return -1;
}
@@ -1538,7 +1538,7 @@ linux_read (struct HardwareInfos *dev,
case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
if (! got_signal)
{
- ri->ri_power = *((int8_t*) iterator.this_arg);
+ ri->ri_power = *((int8_t *) iterator.this_arg);
got_signal = 1;
}
break;
@@ -1546,7 +1546,7 @@ linux_read (struct HardwareInfos *dev,
case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
if (! got_signal)
{
- ri->ri_power = *((int8_t*) iterator.this_arg);
+ ri->ri_power = *((int8_t *) iterator.this_arg);
got_signal = 1;
}
break;
@@ -1554,7 +1554,7 @@ linux_read (struct HardwareInfos *dev,
case IEEE80211_RADIOTAP_DBM_ANTNOISE:
if (! got_noise)
{
- ri->ri_noise = *((int8_t*) iterator.this_arg);
+ ri->ri_noise = *((int8_t *) iterator.this_arg);
got_noise = 1;
}
break;
@@ -1562,7 +1562,7 @@ linux_read (struct HardwareInfos *dev,
case IEEE80211_RADIOTAP_DB_ANTNOISE:
if (! got_noise)
{
- ri->ri_noise = *((int8_t*) iterator.this_arg);
+ ri->ri_noise = *((int8_t *) iterator.this_arg);
got_noise = 1;
}
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,
mas.session = NULL;
(void) GNUNET_SERVER_mst_receive (plugin->helper_payload_tokenizer,
&mas,
- (const char*) &rxinfo[1],
+ (const char *) &rxinfo[1],
msize - sizeof(struct
GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage),
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,
unsigned char*key_buf;
key_len = element_length_in_bytes (k) < 33 ? 3 : element_length_in_bytes (k);
- key_buf = (unsigned char*) malloc (key_len);
+ key_buf = (unsigned char *) malloc (key_len);
element_to_bytes (key_buf, k);
GNUNET_memcpy (key->aes_key,
@@ -219,15 +219,15 @@ write_cpabe (void **result,
*result = GNUNET_malloc (12 + cph_buf_len + aes_buf_len);
ptr = *result;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*len = htonl (file_len);
ptr += 4;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*len = htonl (aes_buf_len);
ptr += 4;
GNUNET_memcpy (ptr, aes_buf, aes_buf_len);
ptr += aes_buf_len;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*len = htonl (cph_buf_len);
ptr += 4;
GNUNET_memcpy (ptr, cph_buf, cph_buf_len);
@@ -246,17 +246,17 @@ read_cpabe (const void *data,
char *ptr;
uint32_t *len;
- ptr = (char*) data;
- len = (uint32_t*) ptr;
+ ptr = (char *) data;
+ len = (uint32_t *) ptr;
buf_len = ntohl (*len);
ptr += 4;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*aes_buf_len = ntohl (*len);
ptr += 4;
*aes_buf = GNUNET_malloc (*aes_buf_len);
GNUNET_memcpy (*aes_buf, ptr, *aes_buf_len);
ptr += *aes_buf_len;
- len = (uint32_t*) ptr;
+ len = (uint32_t *) ptr;
*cph_buf_len = ntohl (*len);
ptr += 4;
*cph_buf = GNUNET_malloc (*cph_buf_len);
@@ -282,7 +282,7 @@ GNUNET_CRYPTO_cpabe_encrypt (const void *block,
int aes_buf_len;
ssize_t result_len;
- if (! (cph = gabe_enc (key->pub, m, (char*) policy)))
+ if (! (cph = gabe_enc (key->pub, m, (char *) policy)))
return GNUNET_SYSERR;
cph_buf_len = gabe_cph_serialize (cph,
&cph_buf);
@@ -329,7 +329,7 @@ GNUNET_CRYPTO_cpabe_decrypt (const void *block,
}
gabe_cph_free (cph);
GNUNET_free (cph);
- plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char**) result);
+ plt_len = aes_128_cbc_decrypt (aes_buf, aes_buf_size, m, (char **) result);
GNUNET_free (cph_buf);
GNUNET_free (aes_buf);
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,
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (edc->map,
&key,
- (void*) (long) i + max,
+ (void *) (long) i + max,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
/* negative values */
@@ -203,7 +203,7 @@ GNUNET_CRYPTO_ecc_dlog_prepare (unsigned int max,
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (edc->map,
&key,
- (void*) (long) max - i,
+ (void *) (long) max - i,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
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,
GNUNET_STRINGS_utf8_toupper (enc, up_ptr);
return GNUNET_STRINGS_string_to_data (upper_enc, enclen,
- (unsigned char*) result,
+ (unsigned char *) result,
sizeof(struct GNUNET_HashCode));
}
@@ -439,7 +439,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
const void *plaintext, size_t plaintext_len,
struct GNUNET_HashCode *hmac)
{
- GNUNET_CRYPTO_hmac_raw ((void*) key->key, sizeof(key->key),
+ GNUNET_CRYPTO_hmac_raw ((void *) key->key, sizeof(key->key),
plaintext, plaintext_len,
hmac);
}
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)
GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]",
gettext_noop ("Use build-in GNUnet stub
resolver"),
options, &run, NULL)) ? 0 : 1;
- GNUNET_free ((void*) argv);
+ GNUNET_free ((void *) argv);
return ret;
}
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,
*/
#define LOG_MAX_LINE_LENGTH (17)
-#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES *LOG_MAX_LINE_LENGTH
+#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES * LOG_MAX_LINE_LENGTH
static char buf[LOG_BUFFER_SIZE];
@@ -238,7 +238,7 @@ read_call (void *cls)
read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
stdout_read_handle,
&read_call,
- (void*) stdout_read_handle);
+ (void *) stdout_read_handle);
return;
}
@@ -430,7 +430,7 @@ runone ()
read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
stdout_read_handle,
&read_call,
- (void*) stdout_read_handle);
+ (void *) stdout_read_handle);
}
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[])
"-o", "BatchMode yes",
"-o", "UserKnownHostsFile /tmp/gnunet_test_socks_ssh_garbage",
"-o", "StrictHostKeyChecking no",
- "127.0.0.1", "-N", (char*) NULL);
+ "127.0.0.1", "-N", (char *) NULL);
perror (
"execlp (\"ssh\",\"ssh\",...,\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
printf (""
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: fix pointer indentation,
gnunet <=