/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dmalloc.c,v $
- * Revision 1.1 1995-03-27 08:35:17 quinn
+ * Revision 1.8 1995-09-29 17:12:33 quinn
+ * Smallish
+ *
+ * Revision 1.7 1995/09/29 17:01:50 quinn
+ * More Windows work
+ *
+ * Revision 1.6 1995/09/27 15:03:02 quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5 1995/05/16 08:51:10 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4 1995/05/15 13:25:13 quinn
+ * Fixed memory bug.
+ *
+ * Revision 1.3 1995/05/15 11:56:55 quinn
+ * Debuggng & adjustments.
+ *
+ * Revision 1.2 1995/04/10 10:23:50 quinn
+ * Fixes.
+ *
+ * Revision 1.1 1995/03/27 08:35:17 quinn
* Created util library
* Added memory debugging module. Imported options-manager
*
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <yconfig.h>
-static const unsigned long head = 0xaabbccdd;
-static const unsigned long tail = 0x11223344;
-static const unsigned long freed = 0xffeeffee;
+static const unsigned char head[] = {44, 33, 22, 11};
+static const unsigned char tail[] = {11, 22, 33, 44};
+static const unsigned char freed[] = {99, 99, 99, 99};
void *d_malloc(char *file, int line, int nbytes)
{
int long len;
if (!(res = malloc(nbytes + 3 * sizeof(long))))
- return 0;
- fprintf(stderr, "---d_malloc, '%s':%d, %d->0x%p\n",
- file, line, nbytes, res + 2 * sizeof(long));
+ return 0;
+ fprintf(stderr, "---d_malloc, '%s':%d, %d->%p\n",
+ file, line, nbytes, res + 2 * sizeof(long));
len = nbytes;
memcpy(res, &head, sizeof(long));
memcpy(res + sizeof(long), &len, sizeof(long));
long len;
if (memcmp(&head, ptr - 2 * sizeof(long), sizeof(long)))
- abort();
- memcpy(ptr, &freed, sizeof(long));
+ abort();
+ memcpy(ptr - 2 * sizeof(long), &freed, sizeof(long));
memcpy(&len, ptr - sizeof(long), sizeof(long));
if (memcmp(ptr + len, &tail, sizeof(long)))
- abort();
- fprintf(stderr, "---d_free, '%s':%d, 0x%p (%d)\n",
- file, line, ptr, len);
+ abort();
+ fprintf(stderr, "---d_free, '%s':%d, %p (%d)\n",
+ file, line, ptr, len);
free(ptr - 2 * sizeof(long));
return;
}
char *r;
if (memcmp(&head, ptr - 2 * sizeof(long), sizeof(long)))
- abort();
+ abort();
memcpy(&len, ptr - sizeof(long), sizeof(long));
if (memcmp(ptr + len, &tail, sizeof(long)))
- abort();
- if (!(r = realloc(ptr, nbytes + 3 * sizeof(long))))
- return 0;
- fprintf(stderr, "---d_realloc, '%s':%d, %d->%d, 0x%p->0x%p\n",
- file, line, len, nbytes, p, r + 2 * sizeof(long));
+ abort();
+ if (!(r = realloc(ptr - 2 * sizeof(long), nbytes + 3 * sizeof(long))))
+ return 0;
+ fprintf(stderr, "---d_realloc, '%s':%d, %d->%d, %p->%p\n",
+ file, line, len, nbytes, p, r + 2 * sizeof(long));
memcpy(r, &head, sizeof(long));
memcpy(r + sizeof(long), &nlen, sizeof(long));
- if (r != ptr - 2 * sizeof(long))
- {
- memcpy(r + 2 * sizeof(long), ptr, len);
- memcpy(ptr - 2 * sizeof(long), &freed, sizeof(long));
- }
r += 2 * sizeof(long);
memcpy(r + nbytes, &tail, sizeof(long));
return r;