[svn:parrot] r19117 - in branches/awaiting-0.4.13: include/parrot src/gc

[petdance]

Author: petdance
Date: Mon Jun 18 23:07:14 2007
New Revision: 19117

Modified:
   branches/awaiting-0.4.13/include/parrot/memory.h
   branches/awaiting-0.4.13/src/gc/memory.c

Log:
Adding more NN/NULLOK

Modified: branches/awaiting-0.4.13/include/parrot/memory.h
==============================================================================
--- branches/awaiting-0.4.13/include/parrot/memory.h    (original)
+++ branches/awaiting-0.4.13/include/parrot/memory.h    Mon Jun 18 23:07:14 2007
@@ -59,8 +59,12 @@
         __attribute__malloc__
         __attribute__warn_unused_result__;
 
-PARROT_API void mem_sys_free( void * from );
-void * mem__internal_allocate( size_t size, const char *file, int line )
+PARROT_API void mem_sys_free( void *from /*NULLOK*/ );
+void * mem__internal_allocate(
+    size_t size,
+    const char *file /*NN*/,
+    int line )
+        __attribute__nonnull__(2)
         __attribute__malloc__
         __attribute__warn_unused_result__;
 
@@ -71,7 +75,10 @@
         __attribute__malloc__
         __attribute__warn_unused_result__;
 
-void mem__internal_free( void *from, const char *file /*NN*/, int line )
+void mem__internal_free(
+    void *from /*NULLOK*/,
+    const char *file /*NN*/,
+    int line )
         __attribute__nonnull__(2);
 
 void * mem__internal_realloc(

Modified: branches/awaiting-0.4.13/src/gc/memory.c
==============================================================================
--- branches/awaiting-0.4.13/src/gc/memory.c    (original)
+++ branches/awaiting-0.4.13/src/gc/memory.c    Mon Jun 18 23:07:14 2007
@@ -48,7 +48,7 @@
 }
 
 void *
-mem__internal_allocate(size_t size, const char *file, int line)
+mem__internal_allocate(size_t size, const char *file /*NN*/, int line)
     /* MALLOC, WARN_UNUSED */
 {
     void * const ptr = malloc((size_t)size);
@@ -182,7 +182,7 @@
 
 PARROT_API
 void
-mem_sys_free(void * from)
+mem_sys_free(void *from /*NULLOK*/)
 {
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Freed %p\n", from);
@@ -192,7 +192,7 @@
 }
 
 void
-mem__internal_free(void *from, const char *file /*NN*/, int line)
+mem__internal_free(void *from /*NULLOK*/, const char *file /*NN*/, int line)
 {
 #ifdef DETAIL_MEMORY_DEBUG
     fprintf(stderr, "Internal free of %p (%s/%d)\n", from, file, line);