More Windows work

[yaz-moved-to-github.git] / util / dmalloc.c

diff --git a/util/dmalloc.c b/util/dmalloc.c
index a5a5bda..7bfc0e0 100644 (file)
--- a/util/dmalloc.c
+++ b/util/dmalloc.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dmalloc.c,v $
- * Revision 1.6  1995-09-27 15:03:02  quinn
+ * 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
@@ -29,6 +32,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <yconfig.h>
 
 static const unsigned char head[] = {44, 33, 22, 11};
 static const unsigned char tail[] = {11, 22, 33, 44};
@@ -40,9 +44,9 @@ void MDF *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));
@@ -56,13 +60,13 @@ void MDF 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;
 }
@@ -74,14 +78,14 @@ void MDF *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);