Changeset 193 for trunk/nom/src/nommemory.c

Timestamp:

Jan 16, 2007, 8:31:25 PM (19 years ago)

Author:

cinc

Message:

Improvements to the GC interface and some more stuff

File:

• trunk/nom/src/nommemory.c (modified) (4 diffs)

trunk/nom/src/nommemory.c

@@ -51 +51 @@
 NOMEXTERN nomToken NOMLINK NOMMalloc(ULONG size)
 {
+  gchar* memPtr;
+
+  if((memPtr=g_malloc(size))==NULLHANDLE)
+    return NULLHANDLE;
+
+  return (nomToken) memPtr;
+
+#if 0
   PULONG memPtr;
 
@@ -59 +67 @@
   memPtr++;
   return (nomToken) memPtr;
+#endif
 }
 
 nomToken NOMLINK NOMCalloc(const ULONG num, const ULONG size)
 {
+  gchar* memPtr;
+
+  if((memPtr=g_malloc(size*num ))==NULLHANDLE)
+    return NULLHANDLE; /* We won't end here because GLib just terminates the process :-/ 
+                          A really sick idea imho. */
+  if(!bUseGC)
+    memset(memPtr, 0, size*num); /* GC always returns zeroed memory */
+
+  return (nomToken) memPtr;
+
+#if 0
   PULONG memPtr;
 
@@ -74 +94 @@
   memPtr++;
   return (nomToken) memPtr;
+#endif
 }
 
@@ -81 +102 @@
 NOMEXTERN boolean NOMLINK NOMFree(const nomToken memPtr)
 {
+#if 0
   ULONG* pul=(PULONG)memPtr;
 
   pul--;
-
   g_free(pul);
+#endif
+  g_free(memPtr);
   return TRUE;
 }