[svn:parrot] r34712 - in trunk: include/parrot src

Author: infinoid
Date: Wed Dec 31 08:41:26 2008
New Revision: 34712

Modified:
   trunk/include/parrot/string_funcs.h
   trunk/src/pmc_freeze.c
   trunk/src/string.c

Log:
[core] Fix 4 more badly marked C function parameters.
(Found by the headerizer NONNULL assert() patch, see Trac #105.)

Modified: trunk/include/parrot/string_funcs.h
==============================================================================
--- trunk/include/parrot/string_funcs.h	(original)
+++ trunk/include/parrot/string_funcs.h	Wed Dec 31 08:41:26 2008
@@ -340,11 +340,10 @@
     ARGIN_NULLOK(const char *buffer),
     UINTVAL len,
     ARGIN(const ENCODING *encoding),
-    ARGIN(const CHARSET *charset),
+    ARGIN_NULLOK(const CHARSET *charset),
     UINTVAL flags)
         __attribute__nonnull__(1)
-        __attribute__nonnull__(4)
-        __attribute__nonnull__(5);
+        __attribute__nonnull__(4);
 
 PARROT_EXPORT
 PARROT_CANNOT_RETURN_NULL

Modified: trunk/src/pmc_freeze.c
==============================================================================
--- trunk/src/pmc_freeze.c	(original)
+++ trunk/src/pmc_freeze.c	Wed Dec 31 08:41:26 2008
@@ -83,9 +83,10 @@
         __attribute__nonnull__(3);
 
 PARROT_INLINE
-static void do_thaw(PARROT_INTERP, ARGIN(PMC* pmc), ARGIN(visit_info *info))
+static void do_thaw(PARROT_INTERP,
+    ARGIN_NULLOK(PMC* pmc),
+    ARGIN(visit_info *info))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
 PARROT_INLINE
@@ -299,10 +300,9 @@
         __attribute__nonnull__(3);
 
 static void visit_todo_list_thaw(PARROT_INTERP,
-    ARGIN(PMC* old),
+    ARGIN_NULLOK(PMC* old),
     ARGIN(visit_info* info))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
@@ -1172,7 +1172,7 @@
 
 PARROT_INLINE
 static void
-do_thaw(PARROT_INTERP, ARGIN(PMC* pmc), ARGIN(visit_info *info))
+do_thaw(PARROT_INTERP, ARGIN_NULLOK(PMC* pmc), ARGIN(visit_info *info))
 {
     UINTVAL id;
     INTVAL type;
@@ -1462,7 +1462,7 @@
 */
 
 static void
-visit_todo_list(PARROT_INTERP, ARGIN(PMC* pmc), ARGIN(visit_info* info))
+visit_todo_list(PARROT_INTERP, ARGIN_NULLOK(PMC* pmc), ARGIN(visit_info* info))
 {
     UINTVAL id;
     int seen;
@@ -1491,7 +1491,7 @@
 */
 
 static void
-visit_todo_list_thaw(PARROT_INTERP, ARGIN(PMC* old), ARGIN(visit_info* info))
+visit_todo_list_thaw(PARROT_INTERP, ARGIN_NULLOK(PMC* old), ARGIN(visit_info* info))
 {
     do_thaw(interp, old, info);
 }

Modified: trunk/src/string.c
==============================================================================
--- trunk/src/string.c	(original)
+++ trunk/src/string.c	Wed Dec 31 08:41:26 2008
@@ -750,7 +750,7 @@
 PARROT_CANNOT_RETURN_NULL
 STRING *
 string_make_direct(PARROT_INTERP, ARGIN_NULLOK(const char *buffer), UINTVAL len,
-        ARGIN(const ENCODING *encoding), ARGIN(const CHARSET *charset), UINTVAL flags)
+        ARGIN(const ENCODING *encoding), ARGIN_NULLOK(const CHARSET *charset), UINTVAL flags)
 {
     DECL_CONST_CAST;
     STRING * const s = new_string_header(interp, flags);

• [svn:parrot] r34712 - in trunk: include/parrot src by infinoid