aboutsummaryrefslogtreecommitdiff
path: root/src/set
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-07-18 21:12:12 +0000
committerChristian Grothoff <christian@grothoff.org>2013-07-18 21:12:12 +0000
commit559c4a784f1197982fa76a85714902e1b1a1bc8b (patch)
treea6e14a15e34cadfe6df386178bebdbe4f104acdc /src/set
parenta3ece19a476acd8f381c94ddf7789ae335cde494 (diff)
downloadgnunet-559c4a784f1197982fa76a85714902e1b1a1bc8b.tar.gz
gnunet-559c4a784f1197982fa76a85714902e1b1a1bc8b.zip
-minor code cleanup
Diffstat (limited to 'src/set')
-rw-r--r--src/set/gnunet-service-set.c6
-rw-r--r--src/set/set_api.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index e5c42eca0..c25c2cbad 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -561,8 +561,9 @@ handle_client_reject (void *cls,
561 const struct GNUNET_MessageHeader *m) 561 const struct GNUNET_MessageHeader *m)
562{ 562{
563 struct Incoming *incoming; 563 struct Incoming *incoming;
564 struct GNUNET_SET_AcceptRejectMessage *msg = (struct GNUNET_SET_AcceptRejectMessage *) m; 564 const struct GNUNET_SET_AcceptRejectMessage *msg;
565 565
566 msg = (const struct GNUNET_SET_AcceptRejectMessage *) m;
566 GNUNET_break (0 == ntohl (msg->request_id)); 567 GNUNET_break (0 == ntohl (msg->request_id));
567 568
568 incoming = get_incoming (ntohl (msg->accept_reject_id)); 569 incoming = get_incoming (ntohl (msg->accept_reject_id));
@@ -603,7 +604,8 @@ handle_client_add_remove (void *cls,
603 } 604 }
604 msg = (const struct GNUNET_SET_ElementMessage *) m; 605 msg = (const struct GNUNET_SET_ElementMessage *) m;
605 el.size = ntohs (m->size) - sizeof *msg; 606 el.size = ntohs (m->size) - sizeof *msg;
606 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client ins/rem element of size %u\n", el.size); 607 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
608 "client ins/rem element of size %u\n", el.size);
607 el.data = &msg[1]; 609 el.data = &msg[1];
608 if (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (m->type)) 610 if (GNUNET_MESSAGE_TYPE_SET_REMOVE == ntohs (m->type))
609 set->vt->remove (set->state, &el); 611 set->vt->remove (set->state, &el);
diff --git a/src/set/set_api.c b/src/set/set_api.c
index d3131648b..b98f9fd92 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -157,12 +157,13 @@ struct GNUNET_SET_ListenHandle
157static void 157static void
158handle_result (void *cls, const struct GNUNET_MessageHeader *mh) 158handle_result (void *cls, const struct GNUNET_MessageHeader *mh)
159{ 159{
160 struct GNUNET_SET_ResultMessage *msg = (struct GNUNET_SET_ResultMessage *) mh; 160 const struct GNUNET_SET_ResultMessage *msg;
161 struct GNUNET_SET_Handle *set = cls; 161 struct GNUNET_SET_Handle *set = cls;
162 struct GNUNET_SET_OperationHandle *oh; 162 struct GNUNET_SET_OperationHandle *oh;
163 struct GNUNET_SET_Element e; 163 struct GNUNET_SET_Element e;
164 enum GNUNET_SET_Status result_status; 164 enum GNUNET_SET_Status result_status;
165 165
166 msg = (const struct GNUNET_SET_ResultMessage *) mh;
166 GNUNET_assert (NULL != set); 167 GNUNET_assert (NULL != set);
167 GNUNET_assert (NULL != set->mq); 168 GNUNET_assert (NULL != set->mq);
168 169