[svn:parrot] r42877 - branches/cs_csr_merge/src/call

[bacek at svn.parrot.org]

Author: bacek
Date: Thu Dec  3 12:17:30 2009
New Revision: 42877
URL: https://trac.parrot.org/parrot/changeset/42877

Log:
Fix some ARGIN guards to allow NULLs

Modified:
   branches/cs_csr_merge/src/call/args.c

Modified: branches/cs_csr_merge/src/call/args.c
==============================================================================
--- branches/cs_csr_merge/src/call/args.c	Thu Dec  3 12:13:31 2009	(r42876)
+++ branches/cs_csr_merge/src/call/args.c	Thu Dec  3 12:17:30 2009	(r42877)
@@ -142,18 +142,16 @@
 static void csr_set_pmc_keyed_int(PARROT_INTERP,
     ARGIN(PMC *self),
     INTVAL key,
-    ARGIN(PMC *value))
+    ARGIN_NULLOK(PMC *value))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(4);
+        __attribute__nonnull__(2);
 
 static void csr_set_pointer_keyed_int(PARROT_INTERP,
     ARGIN(PMC *self),
     INTVAL key,
-    ARGIN(void *value))
+    ARGIN_NULLOK(void *value))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(4);
+        __attribute__nonnull__(2);
 
 static void csr_set_string_keyed_int(PARROT_INTERP,
     ARGIN(PMC *self),
@@ -446,12 +444,10 @@
     , PARROT_ASSERT_ARG(self))
 #define ASSERT_ARGS_csr_set_pmc_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(self) \
-    , PARROT_ASSERT_ARG(value))
+    , PARROT_ASSERT_ARG(self))
 #define ASSERT_ARGS_csr_set_pointer_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(self) \
-    , PARROT_ASSERT_ARG(value))
+    , PARROT_ASSERT_ARG(self))
 #define ASSERT_ARGS_csr_set_string_keyed_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(self))
@@ -2978,7 +2974,7 @@
 */
 
 static void
-csr_set_pointer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN(void *value))
+csr_set_pointer_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN_NULLOK(void *value))
 {
     ASSERT_ARGS(csr_set_pointer_keyed_int)
     void   **values;
@@ -3134,7 +3130,7 @@
 }
 
 static void
-csr_set_pmc_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN(PMC *value))
+csr_set_pmc_keyed_int(PARROT_INTERP, ARGIN(PMC *self), INTVAL key, ARGIN_NULLOK(PMC *value))
 {
     ASSERT_ARGS(csr_set_pmc_keyed_int)
     void *cell = csr_get_pointer_keyed_int(interp, self, key);