Changeset 04e6cf in git for omalloc

Timestamp:

Feb 6, 2022, 2:03:55 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d4f723620e6a8e1eab6e3b1351719895af39a245

Parents:

6a57089b3e776d07691d5d44f2130534d7a2c793

Message:

xalloc: simplified and fixed length for ringorder_M

File:

• omalloc/xalloc.h (modified) (4 diffs)

omalloc/xalloc.h

@@ -82 +82 @@
 
 static inline void * omAlloc0(size_t s)
-{ void *d=omAlloc(s);memset(d,0,s); return d; }
+{ void *d=malloc(s);memset(d,0,s); return d; }
 static inline void * omalloc0(size_t s)
-{ if (s!=0) { void *d=omAlloc(s);memset(d,0,s); return d;} else return NULL; }
-
-static inline void *omRealloc(void *d, size_t ns)
-{ if (d==NULL) return omAlloc(ns);
-  else
-  return realloc(d,ns);
-}
-#define omReallocAligned(A,B) omRealloc(A,B)
-static inline void *omReallocSize(void *d, __attribute__((unused)) size_t os, size_t ns)
-{ if (d==NULL) return omAlloc(ns);
-  else
-  return realloc(d,ns);
-}
+{ if (s!=0) { void *d=malloc(s);memset(d,0,s); return d;} else return NULL; }
 
 static inline void *omRealloc0Size(void *d, __attribute__((unused)) size_t os, size_t ns)
@@ -173 +161 @@
 #define omPrintBinStats(F)
 #define omMarkMemoryAsStatic()
-#define omFreeBin(P,B)           omFree(P)
-#define omfreeSize(P,S)          omFreeSize(P,S)
-#define omFreeFunc               omFree
-#define omFreeBinAddr(P)         omFree(P)
-#define omrealloc(A,NS)          omRealloc(A,NS)
-#define omreallocSize(A,OS,NS)   omRealloc(A,NS)
+#define omFreeBin(P,B)           free(P)
+#define omfreeSize(P,S)          free(P)
+#define omFreeFunc               free
+#define omFreeBinAddr(P)         free(P)
+#define omrealloc(A,NS)          realloc(A,NS)
+#define omreallocSize(A,OS,NS)   realloc(A,NS)
 #define omrealloc0Size(A,OS,NS)  omRealloc0Size(A,OS,NS)
+#define omRealloc(A,B)           realloc(A,B)
+#define omReallocAligned(A,B)    realloc(A,B)
+#define omReallocSize(A,B,C)     realloc(A,C)
+#define omReallocAlignedSize(A,B) realloc(A,B)
 #define omMarkAsStaticAddr(A)
 #define omGetSpecBin(A)          (A)
@@ -190 +182 @@
 #define omTypeReallocAlignedSize     omTypeReallocSize
 #define omTypeRealloc0AlignedSize    omTypeRealloc0Size
-#define omReallocAlignedSize         omReallocSize
 #define omRealloc0AlignedSize        omRealloc0Size
 #define omMemDupAligned              omMemDup
@@ -222 +213 @@
 #undef OMALLOC_USES_MALLOC
 #define X_OMALLOC
-#define omMallocFunc omAlloc
-#define omReallocSizeFunc omReallocSize
+#define omMallocFunc malloc
 #define omFreeSizeFunc omFreeSize
+#define omReallocSizeFunc realloc
 /* #define OM_NDEBUG */
 #undef OM_SING_KEEP