X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fdmalloc.c;h=78603c8af0025b2b889eccb3461f2dfee23e1f8a;hp=a5a5bdabe068d9f6addb1d606b1a81ac66233a96;hb=d8effb26c004e99bfd83855511c4ec5a7c7f3c79;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4

diff --git a/util/dmalloc.c b/util/dmalloc.c
index a5a5bda..78603c8 100644
--- a/util/dmalloc.c
+++ b/util/dmalloc.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dmalloc.c,v $
- * Revision 1.6  1995-09-27 15:03:02  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
@@ -29,20 +35,21 @@
 #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};
 static const unsigned char freed[] = {99, 99, 99, 99};
 
-void MDF *d_malloc(char *file, int line, int nbytes)
+void *d_malloc(char *file, int line, int nbytes)
 {
     char *res;
     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));
@@ -51,37 +58,37 @@ void MDF *d_malloc(char *file, int line, int nbytes)
     return res;
 }
 
-void MDF d_free(char *file, int line, char *ptr)
+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;
 }
 
-void MDF *d_realloc(char *file, int line, char *ptr, int nbytes)
+void *d_realloc(char *file, int line, char *ptr, int nbytes)
 {
     long len, nlen = nbytes;
     char *p = ptr;
     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);