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

[petdance]

Author: petdance
Date: Tue Dec 30 23:14:44 2008
New Revision: 34687

Modified:
   trunk/include/parrot/inter_call.h
   trunk/include/parrot/sub.h
   trunk/src/hash.c

Log:
removed unused variables and re-headerized

Modified: trunk/include/parrot/inter_call.h
==============================================================================
--- trunk/include/parrot/inter_call.h   (original)
+++ trunk/include/parrot/inter_call.h   Tue Dec 30 23:14:44 2008
@@ -113,7 +113,7 @@
 int Parrot_init_arg_indexes_and_sig_pmc(SHIM_INTERP,
     ARGIN(Parrot_Context *ctx),
     ARGIN_NULLOK(opcode_t *indexes),
-    ARGIN_NULLOK(PMC* sig_pmc),
+    ARGIN_NULLOK(PMC *sig_pmc),
     ARGMOD(call_state_item *sti))
         __attribute__nonnull__(2)
         __attribute__nonnull__(5)

Modified: trunk/include/parrot/sub.h
==============================================================================
--- trunk/include/parrot/sub.h  (original)
+++ trunk/include/parrot/sub.h  Tue Dec 30 23:14:44 2008
@@ -327,10 +327,9 @@
         __attribute__nonnull__(3);
 
 void Parrot_continuation_rewind_environment(PARROT_INTERP,
-    ARGIN(PMC *pmc),
+    SHIM(PMC *pmc),
     ARGIN(Parrot_cont *cc))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
         __attribute__nonnull__(3);
 
 PARROT_CAN_RETURN_NULL

Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c    (original)
+++ trunk/src/hash.c    Tue Dec 30 23:14:44 2008
@@ -93,7 +93,9 @@
         __attribute__nonnull__(2);
 
 PARROT_WARN_UNUSED_RESULT
-static size_t key_hash_STRING(PARROT_INTERP, ARGMOD(STRING *s), size_t seed)
+static size_t key_hash_STRING(PARROT_INTERP,
+    ARGMOD(STRING *s),
+    SHIM(size_t seed))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         FUNC_MODIFIES(*s);
@@ -141,7 +143,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 static size_t
-key_hash_STRING(PARROT_INTERP, ARGMOD(STRING *s), size_t seed)
+key_hash_STRING(PARROT_INTERP, ARGMOD(STRING *s), SHIM(size_t seed))
 {
     if (s->hashval == 0) {
         return string_hash(interp, s);
@@ -335,9 +337,6 @@
     int mark_key   = 0;
     int mark_value = 0;
 
-    INTVAL i;
-    UINTVAL entries;
-
     if (hash->entry_type == (PARROT_DATA_TYPE) enum_hash_string
     ||  hash->entry_type == (PARROT_DATA_TYPE) enum_hash_pmc)
         mark_value = 1;