diff options
Diffstat (limited to 'src/psycstore/gnunet-service-psycstore.c')
-rw-r--r-- | src/psycstore/gnunet-service-psycstore.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c index 801ea628d..33e894b5e 100644 --- a/src/psycstore/gnunet-service-psycstore.c +++ b/src/psycstore/gnunet-service-psycstore.c | |||
@@ -117,7 +117,7 @@ send_result_code (struct GNUNET_SERVER_Client *client, uint64_t op_id, | |||
117 | res->op_id = op_id; | 117 | res->op_id = op_id; |
118 | if (0 < err_size) | 118 | if (0 < err_size) |
119 | { | 119 | { |
120 | memcpy (&res[1], err_msg, err_size); | 120 | GNUNET_memcpy (&res[1], err_msg, err_size); |
121 | ((char *) &res[1])[err_size - 1] = '\0'; | 121 | ((char *) &res[1])[err_size - 1] = '\0'; |
122 | } | 122 | } |
123 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 123 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -201,7 +201,7 @@ send_fragment (void *cls, struct GNUNET_MULTICAST_MessageHeader *msg, | |||
201 | res->header.size = htons (sizeof (struct FragmentResult) + msg_size); | 201 | res->header.size = htons (sizeof (struct FragmentResult) + msg_size); |
202 | res->op_id = sc->op_id; | 202 | res->op_id = sc->op_id; |
203 | res->psycstore_flags = htonl (flags); | 203 | res->psycstore_flags = htonl (flags); |
204 | memcpy (&res[1], msg, msg_size); | 204 | GNUNET_memcpy (&res[1], msg, msg_size); |
205 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 205 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
206 | "Sending fragment %ld to client\n", | 206 | "Sending fragment %ld to client\n", |
207 | GNUNET_ntohll (msg->fragment_id)); | 207 | GNUNET_ntohll (msg->fragment_id)); |
@@ -229,8 +229,8 @@ send_state_var (void *cls, const char *name, | |||
229 | res->header.size = htons (sizeof (struct StateResult) + name_size + value_size); | 229 | res->header.size = htons (sizeof (struct StateResult) + name_size + value_size); |
230 | res->op_id = sc->op_id; | 230 | res->op_id = sc->op_id; |
231 | res->name_size = htons (name_size); | 231 | res->name_size = htons (name_size); |
232 | memcpy (&res[1], name, name_size); | 232 | GNUNET_memcpy (&res[1], name, name_size); |
233 | memcpy ((char *) &res[1] + name_size, value, value_size); | 233 | GNUNET_memcpy ((char *) &res[1] + name_size, value, value_size); |
234 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 234 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
235 | "Sending state variable %s to client\n", name); | 235 | "Sending state variable %s to client\n", name); |
236 | GNUNET_SERVER_notification_context_add (nc, sc->client); | 236 | GNUNET_SERVER_notification_context_add (nc, sc->client); |
@@ -563,13 +563,13 @@ recv_state_message_part (void *cls, | |||
563 | { | 563 | { |
564 | scls->mod_oper = pmod->oper; | 564 | scls->mod_oper = pmod->oper; |
565 | scls->mod_name = GNUNET_malloc (name_size); | 565 | scls->mod_name = GNUNET_malloc (name_size); |
566 | memcpy (scls->mod_name, name, name_size); | 566 | GNUNET_memcpy (scls->mod_name, name, name_size); |
567 | 567 | ||
568 | scls->mod_value_size = value_size; | 568 | scls->mod_value_size = value_size; |
569 | scls->mod_value = GNUNET_malloc (scls->mod_value_size); | 569 | scls->mod_value = GNUNET_malloc (scls->mod_value_size); |
570 | scls->mod_value_remaining | 570 | scls->mod_value_remaining |
571 | = scls->mod_value_size - (psize - sizeof (*pmod) - name_size); | 571 | = scls->mod_value_size - (psize - sizeof (*pmod) - name_size); |
572 | memcpy (scls->mod_value, value, value_size - scls->mod_value_remaining); | 572 | GNUNET_memcpy (scls->mod_value, value, value_size - scls->mod_value_remaining); |
573 | } | 573 | } |
574 | } | 574 | } |
575 | scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_MODIFIER; | 575 | scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_MODIFIER; |
@@ -585,7 +585,7 @@ recv_state_message_part (void *cls, | |||
585 | scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_ERROR; | 585 | scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_ERROR; |
586 | } | 586 | } |
587 | psize = ntohs (pmsg->size); | 587 | psize = ntohs (pmsg->size); |
588 | memcpy (scls->mod_value + (scls->mod_value_size - scls->mod_value_remaining), | 588 | GNUNET_memcpy (scls->mod_value + (scls->mod_value_size - scls->mod_value_remaining), |
589 | &pmsg[1], psize - sizeof (*pmsg)); | 589 | &pmsg[1], psize - sizeof (*pmsg)); |
590 | scls->mod_value_remaining -= psize - sizeof (*pmsg); | 590 | scls->mod_value_remaining -= psize - sizeof (*pmsg); |
591 | if (0 == scls->mod_value_remaining) | 591 | if (0 == scls->mod_value_remaining) |
@@ -814,7 +814,7 @@ handle_state_get (void *cls, | |||
814 | if (GNUNET_NO == ret && name_size >= 5) /* min: _a_b\0 */ | 814 | if (GNUNET_NO == ret && name_size >= 5) /* min: _a_b\0 */ |
815 | { | 815 | { |
816 | char *p, *n = GNUNET_malloc (name_size); | 816 | char *p, *n = GNUNET_malloc (name_size); |
817 | memcpy (n, name, name_size); | 817 | GNUNET_memcpy (n, name, name_size); |
818 | while (&n[1] < (p = strrchr (n, '_')) && GNUNET_NO == ret) | 818 | while (&n[1] < (p = strrchr (n, '_')) && GNUNET_NO == ret) |
819 | { | 819 | { |
820 | *p = '\0'; | 820 | *p = '\0'; |