/*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (c) 1995-2005, Index Data.
* See the file LICENSE for details.
*
- * $Id: nmem.c,v 1.6 2004-11-18 15:18:13 heikki Exp $
+ * $Id: nmem.c,v 1.11 2005-01-05 10:23:42 adam Exp $
*/
/**
#include <assert.h>
#include <string.h>
#include <errno.h>
+#include <stddef.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#ifdef WIN32
#define NMEM_CHUNK (4*1024)
+struct align {
+ char x;
+ union {
+ char c;
+ short s;
+ int i;
+ long l;
+#if HAVE_LONG_LONG
+ long long ll;
+#endif
+ float f;
+ double d;
+ } u;
+};
+
+#define NMEM_ALIGN (offsetof(struct align, u))
+
static int log_level=0;
static int log_level_initialized=0;
}
r = p->buf + p->top;
/* align size */
- p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
+ p->top += (size + (NMEM_ALIGN - 1)) & ~(NMEM_ALIGN - 1);
n->total += size;
NMEM_LEAVE;
return r;
void yaz_strerror(char *buf, int max)
{
+#ifdef WIN32
+ DWORD err;
+#endif
char *cp;
if (!log_level_initialized)
{
- log_level=yaz_log_module_level("nmem");
- log_level_initialized=1;
+ log_level = yaz_log_module_level("nmem");
+ log_level_initialized = 1;
}
#ifdef WIN32
- DWORD err = GetLastError();
+ err = GetLastError();
if (err)
{
FormatMessage(