diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/gnunet-service-core_clients.c | 2 | ||||
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 2 | ||||
-rw-r--r-- | src/core/gnunet-service-core_typemap.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c index 5f745e3bc..f6574b7f9 100644 --- a/src/core/gnunet-service-core_clients.c +++ b/src/core/gnunet-service-core_clients.c | |||
@@ -377,7 +377,7 @@ handle_client_send_request (void *cls, struct GNUNET_SERVER_Client *client, | |||
377 | if (car == NULL) | 377 | if (car == NULL) |
378 | { | 378 | { |
379 | /* create new entry */ | 379 | /* create new entry */ |
380 | car = GNUNET_malloc (sizeof (struct GSC_ClientActiveRequest)); | 380 | car = GNUNET_new (struct GSC_ClientActiveRequest); |
381 | GNUNET_assert (GNUNET_OK == | 381 | GNUNET_assert (GNUNET_OK == |
382 | GNUNET_CONTAINER_multipeermap_put (c->requests, | 382 | GNUNET_CONTAINER_multipeermap_put (c->requests, |
383 | &req->peer, | 383 | &req->peer, |
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index a8d3d3609..eb42d6fbc 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -265,7 +265,7 @@ GSC_SESSIONS_create (const struct GNUNET_PeerIdentity *peer, | |||
265 | 265 | ||
266 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating session for peer `%4s'\n", | 266 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating session for peer `%4s'\n", |
267 | GNUNET_i2s (peer)); | 267 | GNUNET_i2s (peer)); |
268 | session = GNUNET_malloc (sizeof (struct Session)); | 268 | session = GNUNET_new (struct Session); |
269 | session->tmap = GSC_TYPEMAP_create (); | 269 | session->tmap = GSC_TYPEMAP_create (); |
270 | session->peer = *peer; | 270 | session->peer = *peer; |
271 | session->kxinfo = kx; | 271 | session->kxinfo = kx; |
diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c index d2dab5d99..c9774ddec 100644 --- a/src/core/gnunet-service-core_typemap.c +++ b/src/core/gnunet-service-core_typemap.c | |||
@@ -114,13 +114,13 @@ GSC_TYPEMAP_get_from_message (const struct GNUNET_MessageHeader *msg) | |||
114 | GNUNET_break_op (0); | 114 | GNUNET_break_op (0); |
115 | return NULL; | 115 | return NULL; |
116 | } | 116 | } |
117 | ret = GNUNET_malloc (sizeof (struct GSC_TypeMap)); | 117 | ret = GNUNET_new (struct GSC_TypeMap); |
118 | memcpy (ret, &msg[1], sizeof (struct GSC_TypeMap)); | 118 | memcpy (ret, &msg[1], sizeof (struct GSC_TypeMap)); |
119 | return ret; | 119 | return ret; |
120 | case GNUNET_MESSAGE_TYPE_CORE_COMPRESSED_TYPE_MAP: | 120 | case GNUNET_MESSAGE_TYPE_CORE_COMPRESSED_TYPE_MAP: |
121 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# type maps received"), | 121 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# type maps received"), |
122 | 1, GNUNET_NO); | 122 | 1, GNUNET_NO); |
123 | ret = GNUNET_malloc (sizeof (struct GSC_TypeMap)); | 123 | ret = GNUNET_new (struct GSC_TypeMap); |
124 | dlen = sizeof (struct GSC_TypeMap); | 124 | dlen = sizeof (struct GSC_TypeMap); |
125 | if ((Z_OK != | 125 | if ((Z_OK != |
126 | uncompress ((Bytef *) ret, &dlen, (const Bytef *) &msg[1], | 126 | uncompress ((Bytef *) ret, &dlen, (const Bytef *) &msg[1], |
@@ -242,7 +242,7 @@ GSC_TYPEMAP_extend (const struct GSC_TypeMap *tmap, const uint16_t * types, | |||
242 | struct GSC_TypeMap *ret; | 242 | struct GSC_TypeMap *ret; |
243 | unsigned int i; | 243 | unsigned int i; |
244 | 244 | ||
245 | ret = GNUNET_malloc (sizeof (struct GSC_TypeMap)); | 245 | ret = GNUNET_new (struct GSC_TypeMap); |
246 | if (NULL != tmap) | 246 | if (NULL != tmap) |
247 | memcpy (ret, tmap, sizeof (struct GSC_TypeMap)); | 247 | memcpy (ret, tmap, sizeof (struct GSC_TypeMap)); |
248 | for (i = 0; i < tcnt; i++) | 248 | for (i = 0; i < tcnt; i++) |
@@ -259,7 +259,7 @@ GSC_TYPEMAP_extend (const struct GSC_TypeMap *tmap, const uint16_t * types, | |||
259 | struct GSC_TypeMap * | 259 | struct GSC_TypeMap * |
260 | GSC_TYPEMAP_create () | 260 | GSC_TYPEMAP_create () |
261 | { | 261 | { |
262 | return GNUNET_malloc (sizeof (struct GSC_TypeMap)); | 262 | return GNUNET_new (struct GSC_TypeMap); |
263 | } | 263 | } |
264 | 264 | ||
265 | 265 | ||