fixing up SHIM args

parrot · May 16, 2011 · ca0e38c · ca0e38c
1 parent 76a525f
commit ca0e38c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/include/parrot/debugger.h b/include/parrot/debugger.h
@@ -277,7 +277,7 @@ void PDB_disable_breakpoint(PARROT_INTERP, ARGIN(const char *command))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-void PDB_disassemble(PARROT_INTERP, const char *command)
+void PDB_disassemble(PARROT_INTERP, ARGIN_NULLOK(const char *command))
         __attribute__nonnull__(1);
 
 size_t PDB_disassemble_op(PARROT_INTERP,
@@ -335,7 +335,7 @@ void PDB_help(PARROT_INTERP, ARGIN(const char *command))
 void PDB_info(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-void PDB_init(PARROT_INTERP, const char *command)
+void PDB_init(PARROT_INTERP, ARGIN_NULLOK(const char *command))
         __attribute__nonnull__(1);
 
 void PDB_list(PARROT_INTERP, ARGIN(const char *command))

diff --git a/include/parrot/encoding.h b/include/parrot/encoding.h
@@ -103,8 +103,9 @@ const STR_VTABLE * Parrot_load_encoding(PARROT_INTERP,
 
 PARROT_EXPORT
 INTVAL Parrot_make_default_encoding(PARROT_INTERP,
-    const char *encodingname,
+    ARGIN(const char *encodingname),
     ARGIN(STR_VTABLE *encoding))
+        __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
 PARROT_EXPORT
@@ -145,7 +146,8 @@ void Parrot_str_internal_register_encoding_names(PARROT_INTERP)
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(encodingname))
 #define ASSERT_ARGS_Parrot_make_default_encoding __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(encoding))
+       PARROT_ASSERT_ARG(encodingname)) \
+    , PARROT_ASSERT_ARG(encoding))
 #define ASSERT_ARGS_Parrot_new_encoding __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_register_encoding __attribute__unused__ int _ASSERT_ARGS_CHECK = (\

diff --git a/include/parrot/scheduler.h b/include/parrot/scheduler.h
@@ -135,9 +135,10 @@ void Parrot_cx_schedule_timer(PARROT_INTERP,
 PARROT_EXPORT
 void Parrot_cx_send_message(PARROT_INTERP,
     ARGIN(STRING *messagetype),
-    PMC *payload)
+    ARGIN(PMC *payload))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
+        __attribute__nonnull__(2)
+        __attribute__nonnull__(3);
 
 void Parrot_cx_check_tasks(PARROT_INTERP, ARGMOD(PMC *scheduler))
         __attribute__nonnull__(1)
@@ -228,7 +229,8 @@ void Parrot_cx_timer_invoke(PARROT_INTERP, ARGIN(PMC *timer))
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_cx_send_message __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(messagetype))
+    , PARROT_ASSERT_ARG(messagetype) \
+    , PARROT_ASSERT_ARG(payload)))
 #define ASSERT_ARGS_Parrot_cx_check_tasks __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(scheduler))

diff --git a/src/debug.c b/src/debug.c
@@ -1957,7 +1957,7 @@ Init the program.
 */
 
 void
-PDB_init(PARROT_INTERP, SHIM(const char *command))
+PDB_init(PARROT_INTERP, ARGIN_NULLOK(SHIM(const char *command)))
 {
     ASSERT_ARGS(PDB_init)
     PDB_t * const pdb = interp->pdb;
@@ -2894,7 +2894,7 @@ Disassemble the bytecode.
 */
 
 void
-PDB_disassemble(PARROT_INTERP, SHIM(const char *command))
+PDB_disassemble(PARROT_INTERP, ARGIN_NULLOK(SHIM(const char *command)))
 {
     ASSERT_ARGS(PDB_disassemble)
     PDB_t    * const pdb = interp->pdb;

diff --git a/src/scheduler.c b/src/scheduler.c
@@ -732,7 +732,7 @@ Send a message to a scheduler in a different interpreter/thread.
 
 PARROT_EXPORT
 void
-Parrot_cx_send_message(PARROT_INTERP, ARGIN(STRING *messagetype), SHIM(PMC *payload))
+Parrot_cx_send_message(PARROT_INTERP, ARGIN(STRING *messagetype), ARGIN(SHIM(PMC *payload)))
 {
     ASSERT_ARGS(Parrot_cx_send_message)
     if (interp->scheduler) {

diff --git a/src/string/encoding.c b/src/string/encoding.c
@@ -449,7 +449,7 @@ Sets the default encoding to C<encoding> with name C<encodingname>.
 
 PARROT_EXPORT
 INTVAL
-Parrot_make_default_encoding(SHIM_INTERP, SHIM(const char *encodingname),
+Parrot_make_default_encoding(SHIM_INTERP, ARGIN(SHIM(const char *encodingname)),
         ARGIN(STR_VTABLE *encoding))
 {
     ASSERT_ARGS(Parrot_make_default_encoding)