diff options
author | lurchi <lurchi@strangeplace.net> | 2017-12-26 18:16:26 +0100 |
---|---|---|
committer | lurchi <lurchi@strangeplace.net> | 2017-12-26 18:16:26 +0100 |
commit | aef12de46c7a1f7a00cad0c66efb750cfe59d708 (patch) | |
tree | 69f2941b37a1aa451086b53eeb74915cc9cf9937 /src/psyc | |
parent | d5698902c09f47a7fcb544e8fbb5da9984ee1384 (diff) | |
download | gnunet-aef12de46c7a1f7a00cad0c66efb750cfe59d708.tar.gz gnunet-aef12de46c7a1f7a00cad0c66efb750cfe59d708.zip |
result is a boolean; stylistic changes
Diffstat (limited to 'src/psyc')
-rw-r--r-- | src/psyc/gnunet-service-psyc.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c index 35cc5551d..8b5c69a65 100644 --- a/src/psyc/gnunet-service-psyc.c +++ b/src/psyc/gnunet-service-psyc.c | |||
@@ -1696,7 +1696,7 @@ store_recv_slave_counters (void *cls, int result, uint64_t max_fragment_id, | |||
1696 | res.result_code = htonl (result); | 1696 | res.result_code = htonl (result); |
1697 | res.max_message_id = GNUNET_htonll (max_message_id); | 1697 | res.max_message_id = GNUNET_htonll (max_message_id); |
1698 | 1698 | ||
1699 | if (GNUNET_OK == result || GNUNET_NO == result) | 1699 | if (GNUNET_YES == result || GNUNET_NO == result) |
1700 | { | 1700 | { |
1701 | chn->max_message_id = max_message_id; | 1701 | chn->max_message_id = max_message_id; |
1702 | chn->max_state_message_id = max_state_message_id; | 1702 | chn->max_state_message_id = max_state_message_id; |
@@ -1901,7 +1901,7 @@ handle_client_slave_join (void *cls, | |||
1901 | GNUNET_CONTAINER_multihashmap_put (slaves, &chn->pub_key_hash, chn, | 1901 | GNUNET_CONTAINER_multihashmap_put (slaves, &chn->pub_key_hash, chn, |
1902 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); | 1902 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); |
1903 | chn->store_op = GNUNET_PSYCSTORE_counters_get (store, &chn->pub_key, | 1903 | chn->store_op = GNUNET_PSYCSTORE_counters_get (store, &chn->pub_key, |
1904 | &store_recv_slave_counters, slv); | 1904 | &store_recv_slave_counters, slv); |
1905 | } | 1905 | } |
1906 | else | 1906 | else |
1907 | { | 1907 | { |
@@ -1948,8 +1948,9 @@ handle_client_slave_join (void *cls, | |||
1948 | } | 1948 | } |
1949 | 1949 | ||
1950 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1950 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1951 | "%p Client connected as slave to channel %s.\n", | 1951 | "Client %p connected as slave to channel %s.\n", |
1952 | slv, GNUNET_h2s (&chn->pub_key_hash)); | 1952 | client, |
1953 | GNUNET_h2s (&chn->pub_key_hash)); | ||
1953 | 1954 | ||
1954 | struct ClientList *cli = GNUNET_malloc (sizeof (*cli)); | 1955 | struct ClientList *cli = GNUNET_malloc (sizeof (*cli)); |
1955 | cli->client = client; | 1956 | cli->client = client; |
@@ -2399,7 +2400,9 @@ handle_client_psyc_message (void *cls, | |||
2399 | if (GNUNET_YES != chn->is_ready) | 2400 | if (GNUNET_YES != chn->is_ready) |
2400 | { | 2401 | { |
2401 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 2402 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
2402 | "%p Channel is not ready yet, disconnecting client.\n", chn); | 2403 | "%p Channel is not ready yet, disconnecting client %p.\n", |
2404 | chn, | ||
2405 | client); | ||
2403 | GNUNET_break (0); | 2406 | GNUNET_break (0); |
2404 | GNUNET_SERVICE_client_drop (client); | 2407 | GNUNET_SERVICE_client_drop (client); |
2405 | return; | 2408 | return; |