diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-04-30 13:41:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-04-30 13:41:07 +0000 |
commit | e67c5886c645a5fda7753d3f72f62ea655d6655b (patch) | |
tree | 3058a0f96ddc820a97e38e47d87e6ebf685b23b8 /src/include/gnunet_common.h | |
parent | d59ea5663203392637e84dea69feb9671ca2a3de (diff) | |
download | gnunet-e67c5886c645a5fda7753d3f72f62ea655d6655b.tar.gz gnunet-e67c5886c645a5fda7753d3f72f62ea655d6655b.zip |
fixes
Diffstat (limited to 'src/include/gnunet_common.h')
-rw-r--r-- | src/include/gnunet_common.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index d7842a519..cb2ed4c0c 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
@@ -322,7 +322,7 @@ unsigned long long GNUNET_htonll (unsigned long long n); | |||
322 | * | 322 | * |
323 | * @param size the number of bytes to allocate, must be | 323 | * @param size the number of bytes to allocate, must be |
324 | * smaller than 40 MB. | 324 | * smaller than 40 MB. |
325 | * @return pointer to size bytes of memory | 325 | * @return pointer to size bytes of memory, never NULL (!) |
326 | */ | 326 | */ |
327 | #define GNUNET_malloc(size) GNUNET_xmalloc_(size, __FILE__, __LINE__) | 327 | #define GNUNET_malloc(size) GNUNET_xmalloc_(size, __FILE__, __LINE__) |
328 | 328 | ||
@@ -331,7 +331,7 @@ unsigned long long GNUNET_htonll (unsigned long long n); | |||
331 | * The memory will be zero'ed out. | 331 | * The memory will be zero'ed out. |
332 | * | 332 | * |
333 | * @param size the number of bytes to allocate | 333 | * @param size the number of bytes to allocate |
334 | * @return pointer to size bytes of memory | 334 | * @return pointer to size bytes of memory, NULL if we do not have enough memory |
335 | */ | 335 | */ |
336 | #define GNUNET_malloc_large(size) GNUNET_xmalloc_unchecked_(size, __FILE__, __LINE__) | 336 | #define GNUNET_malloc_large(size) GNUNET_xmalloc_unchecked_(size, __FILE__, __LINE__) |
337 | 337 | ||
@@ -452,16 +452,16 @@ void *GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber); | |||
452 | 452 | ||
453 | 453 | ||
454 | /** | 454 | /** |
455 | * Allocate memory. This function does not check if the | 455 | * Allocate memory. This function does not check if the allocation |
456 | * allocation request is within reasonable bounds, allowing | 456 | * request is within reasonable bounds, allowing allocations larger |
457 | * allocations larger than 40 MB. If you don't expect the | 457 | * than 40 MB. If you don't expect the possibility of very large |
458 | * possibility of very large allocations, use GNUNET_malloc instead. | 458 | * allocations, use GNUNET_malloc instead. The memory will be zero'ed |
459 | * The memory will be zero'ed out. | 459 | * out. |
460 | * | 460 | * |
461 | * @param size number of bytes to allocate | 461 | * @param size number of bytes to allocate |
462 | * @param filename where is this call being made (for debugging) | 462 | * @param filename where is this call being made (for debugging) |
463 | * @param linenumber line where this call is being made (for debugging) | 463 | * @param linenumber line where this call is being made (for debugging) |
464 | * @return allocated memory, never NULL | 464 | * @return pointer to size bytes of memory, NULL if we do not have enough memory |
465 | */ | 465 | */ |
466 | void *GNUNET_xmalloc_unchecked_ (size_t size, | 466 | void *GNUNET_xmalloc_unchecked_ (size_t size, |
467 | const char *filename, int linenumber); | 467 | const char *filename, int linenumber); |