X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fdmalloc.c;h=78603c8af0025b2b889eccb3461f2dfee23e1f8a;hp=cbe190c77bcd3b52540bfc9c561d12c6bea7012e;hb=d8effb26c004e99bfd83855511c4ec5a7c7f3c79;hpb=99268f722648e84bf5c54eb685a1434e100f38a1 diff --git a/util/dmalloc.c b/util/dmalloc.c index cbe190c..78603c8 100644 --- a/util/dmalloc.c +++ b/util/dmalloc.c @@ -4,7 +4,16 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: dmalloc.c,v $ - * Revision 1.5 1995-05-16 08:51:10 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 @@ -26,6 +35,7 @@ #include #include #include +#include static const unsigned char head[] = {44, 33, 22, 11}; static const unsigned char tail[] = {11, 22, 33, 44}; @@ -37,9 +47,9 @@ void *d_malloc(char *file, int line, int nbytes) int long len; if (!(res = malloc(nbytes + 3 * sizeof(long)))) - return 0; + return 0; fprintf(stderr, "---d_malloc, '%s':%d, %d->%p\n", - file, line, nbytes, res + 2 * sizeof(long)); + file, line, nbytes, res + 2 * sizeof(long)); len = nbytes; memcpy(res, &head, sizeof(long)); memcpy(res + sizeof(long), &len, sizeof(long)); @@ -53,13 +63,13 @@ void d_free(char *file, int line, char *ptr) long len; if (memcmp(&head, ptr - 2 * sizeof(long), sizeof(long))) - abort(); + abort(); memcpy(ptr - 2 * sizeof(long), &freed, sizeof(long)); memcpy(&len, ptr - sizeof(long), sizeof(long)); if (memcmp(ptr + len, &tail, sizeof(long))) - abort(); + abort(); fprintf(stderr, "---d_free, '%s':%d, %p (%d)\n", - file, line, ptr, len); + file, line, ptr, len); free(ptr - 2 * sizeof(long)); return; } @@ -71,14 +81,14 @@ void *d_realloc(char *file, int line, char *ptr, int nbytes) 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(); + abort(); if (!(r = realloc(ptr - 2 * sizeof(long), nbytes + 3 * sizeof(long)))) - return 0; + return 0; fprintf(stderr, "---d_realloc, '%s':%d, %d->%d, %p->%p\n", - file, line, len, nbytes, p, r + 2 * sizeof(long)); + file, line, len, nbytes, p, r + 2 * sizeof(long)); memcpy(r, &head, sizeof(long)); memcpy(r + sizeof(long), &nlen, sizeof(long)); r += 2 * sizeof(long);