#include "platform.h"
#include "gnunet_common.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
+
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
#ifndef INT_MAX
#define INT_MAX 0x7FFFFFFF
#endif
GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber)
{
void *ret;
+
/* As a security precaution, we generally do not allow very large
- allocations using the default 'GNUNET_malloc' macro */
+ * allocations using the default 'GNUNET_malloc' macro */
GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
ret = GNUNET_xmalloc_unchecked_ (size, filename, linenumber);
if (ret == NULL)
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "malloc");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
abort ();
}
return ret;
* @param linenumber line where this call is being made (for debugging)
* @return allocated memory, never NULL
*/
-void *GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename, int linenumber)
+void *
+GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename,
+ int linenumber)
{
void *ret;
+
/* As a security precaution, we generally do not allow very large
- allocations here */
+ * allocations here */
GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
#ifdef W32_MEM_LIMIT
size += sizeof (size_t);
ret = malloc (size);
if (ret == NULL)
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "malloc");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
abort ();
}
#ifdef W32_MEM_LIMIT
* @return pointer to size bytes of memory
*/
void *
-GNUNET_xrealloc_ (void *ptr,
- size_t n,
- const char *filename, int linenumber)
+GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
{
#ifdef W32_MEM_LIMIT
n += sizeof (size_t);
mem_used = mem_used - *((size_t *) ptr) + n;
#endif
ptr = realloc (ptr, n);
- if (!ptr)
+ if ((NULL == ptr) && (n > 0))
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "realloc");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "realloc");
abort ();
}
#ifdef W32_MEM_LIMIT
* Dup partially a string (same semantics as strndup).
*
* @param str the string to dup
- * @param len the lenght of the string to dup
+ * @param len the length of the string to dup
* @param filename where in the code was the call to GNUNET_strndup
* @param linenumber where in the code was the call to GNUNET_strndup
* @return strndup(str,len)
*/
char *
-GNUNET_xstrndup_ (const char *str, size_t len, const char *filename, int linenumber)
+GNUNET_xstrndup_ (const char *str, size_t len, const char *filename,
+ int linenumber)
{
char *res;
GNUNET_assert_at (str != NULL, filename, linenumber);
- len = GNUNET_MIN(len,strlen(str));
+ len = GNUNET_MIN (len, strlen (str));
res = GNUNET_xmalloc_ (len + 1, filename, linenumber);
memcpy (res, str, len);
res[len] = '\0';
* @param linenumber where in the code was the call to GNUNET_array_grow
*/
void
-GNUNET_xgrow_ (void **old,
- size_t elementSize,
- unsigned int *oldCount,
- unsigned int newCount, const char *filename, int linenumber)
+GNUNET_xgrow_ (void **old, size_t elementSize, unsigned int *oldCount,
+ unsigned int newCount, const char *filename, int linenumber)
{
void *tmp;
size_t size;
else
{
tmp = GNUNET_xmalloc_ (size, filename, linenumber);
- memset (tmp, 0, size); /* client code should not rely on this, though... */
+ memset (tmp, 0, size); /* client code should not rely on this, though... */
if (*oldCount > newCount)
- *oldCount = newCount; /* shrink is also allowed! */
+ *oldCount = newCount; /* shrink is also allowed! */
memcpy (tmp, *old, elementSize * (*oldCount));
}
return ret;
}
+
+/**
+ * Create a copy of the given message.
+ *
+ * @param msg message to copy
+ * @return duplicate of the message
+ */
+struct GNUNET_MessageHeader *
+GNUNET_copy_message (const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_MessageHeader *ret;
+ uint16_t msize;
+
+ msize = ntohs (msg->size);
+ GNUNET_assert (msize >= sizeof (struct GNUNET_MessageHeader));
+ ret = GNUNET_malloc (msize);
+ memcpy (ret, msg, msize);
+ return ret;
+}
+
+
/* end of common_allocation.c */