diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-07 00:42:31 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-07 00:42:31 +0000 |
commit | d30f73b49715899b2aa12e4819a0e105994c5411 (patch) | |
tree | a1c2ff23e637053477334bddcbe4e8969c6cfc5d /src/scalarproduct/gnunet-service-scalarproduct_alice.c | |
parent | 7b993324a717497da6d34573a45150c48ca8786f (diff) | |
download | gnunet-d30f73b49715899b2aa12e4819a0e105994c5411.tar.gz gnunet-d30f73b49715899b2aa12e4819a0e105994c5411.zip |
-fix some of the obvious issues
Diffstat (limited to 'src/scalarproduct/gnunet-service-scalarproduct_alice.c')
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct_alice.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c index 1cfc2a89f..b5ab8a88f 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c | |||
@@ -817,8 +817,8 @@ static int | |||
817 | element_cmp (const void *a, | 817 | element_cmp (const void *a, |
818 | const void *b) | 818 | const void *b) |
819 | { | 819 | { |
820 | const struct MpiElement *ma = *(const struct MpiElement **) a; | 820 | const struct MpiElement *ma = a; |
821 | const struct MpiElement *mb = *(const struct MpiElement **) b; | 821 | const struct MpiElement *mb = b; |
822 | 822 | ||
823 | return GNUNET_CRYPTO_hash_cmp (ma->key, | 823 | return GNUNET_CRYPTO_hash_cmp (ma->key, |
824 | mb->key); | 824 | mb->key); |
@@ -858,7 +858,7 @@ send_alices_cryptodata_message (struct AliceServiceSession *s) | |||
858 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 858 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
859 | "Finished intersection, %d items remain\n", | 859 | "Finished intersection, %d items remain\n", |
860 | s->used_element_count); | 860 | s->used_element_count); |
861 | qsort (s->intersected_elements, | 861 | qsort (s->sorted_elements, |
862 | s->used_element_count, | 862 | s->used_element_count, |
863 | sizeof (struct MpiElement), | 863 | sizeof (struct MpiElement), |
864 | &element_cmp); | 864 | &element_cmp); |
@@ -1296,6 +1296,8 @@ handle_client_disconnect (void *cls, | |||
1296 | { | 1296 | { |
1297 | struct AliceServiceSession *s; | 1297 | struct AliceServiceSession *s; |
1298 | 1298 | ||
1299 | if (NULL == client) | ||
1300 | return; | ||
1299 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1301 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1300 | "Client %p disconnected from us.\n", | 1302 | "Client %p disconnected from us.\n", |
1301 | client); | 1303 | client); |