[svn:parrot] r44257 - in branches/sys_mem_reduce: include/parrot src/string

[bacek at svn.parrot.org]

Author: bacek
Date: Sat Feb 20 22:57:57 2010
New Revision: 44257
URL: https://trac.parrot.org/parrot/changeset/44257

Log:
Rerun headerizer

Modified:
   branches/sys_mem_reduce/include/parrot/encoding.h
   branches/sys_mem_reduce/include/parrot/packfile.h
   branches/sys_mem_reduce/src/string/encoding.c

Modified: branches/sys_mem_reduce/include/parrot/encoding.h
==============================================================================
--- branches/sys_mem_reduce/include/parrot/encoding.h	Sat Feb 20 22:57:33 2010	(r44256)
+++ branches/sys_mem_reduce/include/parrot/encoding.h	Sat Feb 20 22:57:57 2010	(r44257)
@@ -143,7 +143,8 @@
 PARROT_EXPORT
 PARROT_MALLOC
 PARROT_CANNOT_RETURN_NULL
-ENCODING * Parrot_new_encoding(SHIM_INTERP);
+ENCODING * Parrot_new_encoding(PARROT_INTERP)
+        __attribute__nonnull__(1);
 
 PARROT_EXPORT
 INTVAL Parrot_register_encoding(PARROT_INTERP,
@@ -180,7 +181,8 @@
     , PARROT_ASSERT_ARG(encodingname))
 #define ASSERT_ARGS_Parrot_make_default_encoding __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(encoding))
-#define ASSERT_ARGS_Parrot_new_encoding __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
+#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 = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(encodingname) \

Modified: branches/sys_mem_reduce/include/parrot/packfile.h
==============================================================================
--- branches/sys_mem_reduce/include/parrot/packfile.h	Sat Feb 20 22:57:33 2010	(r44256)
+++ branches/sys_mem_reduce/include/parrot/packfile.h	Sat Feb 20 22:57:57 2010	(r44257)
@@ -451,9 +451,10 @@
         __attribute__nonnull__(2);
 
 PARROT_EXPORT
-void PackFile_add_segment(SHIM_INTERP,
+void PackFile_add_segment(PARROT_INTERP,
     ARGMOD(PackFile_Directory *dir),
     ARGIN(PackFile_Segment *seg))
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
         FUNC_MODIFIES(*dir);
@@ -836,7 +837,8 @@
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(self))
 #define ASSERT_ARGS_PackFile_add_segment __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(dir) \
+       PARROT_ASSERT_ARG(interp) \
+    , PARROT_ASSERT_ARG(dir) \
     , PARROT_ASSERT_ARG(seg))
 #define ASSERT_ARGS_PackFile_Annotations_add_entry \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\

Modified: branches/sys_mem_reduce/src/string/encoding.c
==============================================================================
--- branches/sys_mem_reduce/src/string/encoding.c	Sat Feb 20 22:57:33 2010	(r44256)
+++ branches/sys_mem_reduce/src/string/encoding.c	Sat Feb 20 22:57:57 2010	(r44257)
@@ -24,14 +24,16 @@
 /* HEADERIZER BEGIN: static */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 
-static INTVAL register_encoding(SHIM_INTERP,
+static INTVAL register_encoding(PARROT_INTERP,
     ARGIN(const char *encodingname),
     ARGIN(ENCODING *encoding))
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
 #define ASSERT_ARGS_register_encoding __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(encodingname) \
+       PARROT_ASSERT_ARG(interp) \
+    , PARROT_ASSERT_ARG(encodingname) \
     , PARROT_ASSERT_ARG(encoding))
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: static */