diff options
Diffstat (limited to 'src/util/common_allocation.c')
-rw-r--r-- | src/util/common_allocation.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index 737584815..be2538c3f 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c | |||
@@ -100,8 +100,11 @@ GNUNET_xmalloc_ (size_t size, | |||
100 | * @return allocated memory, never NULL | 100 | * @return allocated memory, never NULL |
101 | */ | 101 | */ |
102 | void ** | 102 | void ** |
103 | GNUNET_xnew_array_2d_ (size_t n, size_t m, size_t elementSize, | 103 | GNUNET_xnew_array_2d_ (size_t n, |
104 | const char *filename, int linenumber) | 104 | size_t m, |
105 | size_t elementSize, | ||
106 | const char *filename, | ||
107 | int linenumber) | ||
105 | { | 108 | { |
106 | /* use char pointer internally to avoid void pointer arithmetic warnings */ | 109 | /* use char pointer internally to avoid void pointer arithmetic warnings */ |
107 | char **ret = GNUNET_xmalloc_ (n * sizeof (void *) + /* 1. dim header */ | 110 | char **ret = GNUNET_xmalloc_ (n * sizeof (void *) + /* 1. dim header */ |
@@ -218,6 +221,8 @@ GNUNET_xmalloc_unchecked_ (size_t size, | |||
218 | { | 221 | { |
219 | void *result; | 222 | void *result; |
220 | 223 | ||
224 | (void) filename; | ||
225 | (void) linenumber; | ||
221 | #ifdef W32_MEM_LIMIT | 226 | #ifdef W32_MEM_LIMIT |
222 | size += sizeof (size_t); | 227 | size += sizeof (size_t); |
223 | if (mem_used + size > W32_MEM_LIMIT) | 228 | if (mem_used + size > W32_MEM_LIMIT) |
@@ -256,6 +261,9 @@ GNUNET_xrealloc_ (void *ptr, | |||
256 | const char *filename, | 261 | const char *filename, |
257 | int linenumber) | 262 | int linenumber) |
258 | { | 263 | { |
264 | (void) filename; | ||
265 | (void) linenumber; | ||
266 | |||
259 | #ifdef W32_MEM_LIMIT | 267 | #ifdef W32_MEM_LIMIT |
260 | n += sizeof (size_t); | 268 | n += sizeof (size_t); |
261 | ptr = &((size_t *) ptr)[-1]; | 269 | ptr = &((size_t *) ptr)[-1]; |
@@ -264,7 +272,8 @@ GNUNET_xrealloc_ (void *ptr, | |||
264 | ptr = realloc (ptr, n); | 272 | ptr = realloc (ptr, n); |
265 | if ((NULL == ptr) && (n > 0)) | 273 | if ((NULL == ptr) && (n > 0)) |
266 | { | 274 | { |
267 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "realloc"); | 275 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, |
276 | "realloc"); | ||
268 | GNUNET_assert (0); | 277 | GNUNET_assert (0); |
269 | } | 278 | } |
270 | #ifdef W32_MEM_LIMIT | 279 | #ifdef W32_MEM_LIMIT |
@@ -501,9 +510,13 @@ GNUNET_snprintf (char *buf, | |||
501 | va_list args; | 510 | va_list args; |
502 | 511 | ||
503 | va_start (args, format); | 512 | va_start (args, format); |
504 | ret = VSNPRINTF (buf, size, format, args); | 513 | ret = VSNPRINTF (buf, |
514 | size, | ||
515 | format, | ||
516 | args); | ||
505 | va_end (args); | 517 | va_end (args); |
506 | GNUNET_assert (ret < size); | 518 | GNUNET_assert ( (ret >= 0) && |
519 | (((size_t) ret) < size) ); | ||
507 | return ret; | 520 | return ret; |
508 | } | 521 | } |
509 | 522 | ||
@@ -523,7 +536,9 @@ GNUNET_copy_message (const struct GNUNET_MessageHeader *msg) | |||
523 | msize = ntohs (msg->size); | 536 | msize = ntohs (msg->size); |
524 | GNUNET_assert (msize >= sizeof (struct GNUNET_MessageHeader)); | 537 | GNUNET_assert (msize >= sizeof (struct GNUNET_MessageHeader)); |
525 | ret = GNUNET_malloc (msize); | 538 | ret = GNUNET_malloc (msize); |
526 | GNUNET_memcpy (ret, msg, msize); | 539 | GNUNET_memcpy (ret, |
540 | msg, | ||
541 | msize); | ||
527 | return ret; | 542 | return ret; |
528 | } | 543 | } |
529 | 544 | ||