[svn:parrot] r48901 - branches/hash_inlined_func/src

[chromatic at svn.parrot.org]

Author: chromatic
Date: Fri Sep 10 02:49:17 2010
New Revision: 48901
URL: https://trac.parrot.org/parrot/changeset/48901

Log:
[hash] Fixed annotations for hash_compare().

See also r48879.

Modified:
   branches/hash_inlined_func/src/hash.c

Modified: branches/hash_inlined_func/src/hash.c
==============================================================================
--- branches/hash_inlined_func/src/hash.c	Fri Sep 10 02:48:54 2010	(r48900)
+++ branches/hash_inlined_func/src/hash.c	Fri Sep 10 02:49:17 2010	(r48901)
@@ -58,12 +58,10 @@
 PARROT_INLINE
 static int hash_compare(PARROT_INTERP,
     ARGIN(const Hash *hash),
-    ARGIN(void *a),
-    ARGIN(void *b))
+    ARGIN_NULLOK(void *a),
+    ARGIN_NULLOK(void *b))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        __attribute__nonnull__(4);
+        __attribute__nonnull__(2);
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_PURE_FUNCTION
@@ -123,9 +121,7 @@
     , PARROT_ASSERT_ARG(value))
 #define ASSERT_ARGS_hash_compare __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(hash) \
-    , PARROT_ASSERT_ARG(a) \
-    , PARROT_ASSERT_ARG(b))
+    , PARROT_ASSERT_ARG(hash))
 #define ASSERT_ARGS_hash_compare_cstring __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(a) \
     , PARROT_ASSERT_ARG(b))
@@ -471,7 +467,8 @@
 PARROT_PURE_FUNCTION
 PARROT_INLINE
 static int
-hash_compare(PARROT_INTERP, ARGIN(const Hash *hash), ARGIN(void *a), ARGIN(void *b))
+hash_compare(PARROT_INTERP, ARGIN(const Hash *hash), ARGIN_NULLOK(void *a),
+    ARGIN_NULLOK(void *b))
 {
     ASSERT_ARGS(hash_compare)