diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-16 10:54:49 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-16 10:54:49 +0200 |
commit | 30e8dd5bbe3ee00942e5f9aa303429249c8e9b3d (patch) | |
tree | 1cb2bc6072e623f33a103752527e8e000ae776b4 /src/set | |
parent | 09c3455b2c3dd01e52ac2dd9c62c41b3ebcf8028 (diff) | |
download | gnunet-30e8dd5bbe3ee00942e5f9aa303429249c8e9b3d.tar.gz gnunet-30e8dd5bbe3ee00942e5f9aa303429249c8e9b3d.zip |
-fix warnings except rps mess
Diffstat (limited to 'src/set')
-rw-r--r-- | src/set/gnunet-service-set_union.c | 18 | ||||
-rw-r--r-- | src/set/set_api.c | 3 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 87c6faf98..931d7e753 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c | |||
@@ -563,8 +563,8 @@ prepare_ibf_iterator (void *cls, | |||
563 | struct IBF_Key salted_key; | 563 | struct IBF_Key salted_key; |
564 | 564 | ||
565 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 565 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
566 | "[OP %x] inserting %lx (hash %s) into ibf\n", | 566 | "[OP %p] inserting %lx (hash %s) into ibf\n", |
567 | (void *) op, | 567 | op, |
568 | (unsigned long) ke->ibf_key.key_val, | 568 | (unsigned long) ke->ibf_key.key_val, |
569 | GNUNET_h2s (&ke->element->element_hash)); | 569 | GNUNET_h2s (&ke->element->element_hash)); |
570 | salt_key (&ke->ibf_key, | 570 | salt_key (&ke->ibf_key, |
@@ -929,7 +929,7 @@ handle_union_p2p_strata_estimator (void *cls, | |||
929 | (0 == other_size)) | 929 | (0 == other_size)) |
930 | { | 930 | { |
931 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 931 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
932 | "Deciding to go for full set transmission (diff=%d, own set=%u)\n", | 932 | "Deciding to go for full set transmission (diff=%d, own set=%llu)\n", |
933 | diff, | 933 | diff, |
934 | op->state->initial_size); | 934 | op->state->initial_size); |
935 | GNUNET_STATISTICS_update (_GSS_statistics, | 935 | GNUNET_STATISTICS_update (_GSS_statistics, |
@@ -1004,8 +1004,8 @@ send_offers_iterator (void *cls, | |||
1004 | GNUNET_assert (NULL != ev); | 1004 | GNUNET_assert (NULL != ev); |
1005 | *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash; | 1005 | *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash; |
1006 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1006 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1007 | "[OP %x] sending element offer (%s) to peer\n", | 1007 | "[OP %p] sending element offer (%s) to peer\n", |
1008 | (void *) op, | 1008 | op, |
1009 | GNUNET_h2s (&ke->element->element_hash)); | 1009 | GNUNET_h2s (&ke->element->element_hash)); |
1010 | GNUNET_MQ_send (op->mq, ev); | 1010 | GNUNET_MQ_send (op->mq, ev); |
1011 | return GNUNET_YES; | 1011 | return GNUNET_YES; |
@@ -2004,8 +2004,8 @@ handle_union_p2p_demand (void *cls, | |||
2004 | emsg->reserved = htons (0); | 2004 | emsg->reserved = htons (0); |
2005 | emsg->element_type = htons (ee->element.element_type); | 2005 | emsg->element_type = htons (ee->element.element_type); |
2006 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2006 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2007 | "[OP %x] Sending demanded element (size %u, hash %s) to peer\n", | 2007 | "[OP %p] Sending demanded element (size %u, hash %s) to peer\n", |
2008 | (void *) op, | 2008 | op, |
2009 | (unsigned int) ee->element.size, | 2009 | (unsigned int) ee->element.size, |
2010 | GNUNET_h2s (&ee->element_hash)); | 2010 | GNUNET_h2s (&ee->element_hash)); |
2011 | GNUNET_MQ_send (op->mq, ev); | 2011 | GNUNET_MQ_send (op->mq, ev); |
@@ -2120,8 +2120,8 @@ handle_union_p2p_offer (void *cls, | |||
2120 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); | 2120 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); |
2121 | 2121 | ||
2122 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2122 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2123 | "[OP %x] Requesting element (hash %s)\n", | 2123 | "[OP %p] Requesting element (hash %s)\n", |
2124 | (void *) op, GNUNET_h2s (hash)); | 2124 | op, GNUNET_h2s (hash)); |
2125 | ev = GNUNET_MQ_msg_header_extra (demands, | 2125 | ev = GNUNET_MQ_msg_header_extra (demands, |
2126 | sizeof(struct GNUNET_HashCode), | 2126 | sizeof(struct GNUNET_HashCode), |
2127 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND); | 2127 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND); |
diff --git a/src/set/set_api.c b/src/set/set_api.c index ce4b1c965..a082c23c1 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c | |||
@@ -630,8 +630,7 @@ create_internal (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
630 | else | 630 | else |
631 | { | 631 | { |
632 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 632 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
633 | "Creating new set (lazy copy)\n", | 633 | "Creating new set (lazy copy)\n"); |
634 | op); | ||
635 | mqm = GNUNET_MQ_msg (copy_msg, | 634 | mqm = GNUNET_MQ_msg (copy_msg, |
636 | GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT); | 635 | GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT); |
637 | copy_msg->cookie = *cookie; | 636 | copy_msg->cookie = *cookie; |