[svn:parrot] r19013 - trunk/src

[petdance]

Author: petdance
Date: Thu Jun 14 18:57:11 2007
New Revision: 19013

Modified:
   trunk/src/builtin.c

Log:
removed unnecessary parms from static functions

Modified: trunk/src/builtin.c
==============================================================================
--- trunk/src/builtin.c (original)
+++ trunk/src/builtin.c Thu Jun 14 18:57:11 2007
@@ -117,28 +117,26 @@
     }
 }
 
-static int find_builtin(Interp *interp, const char *func)
-    __attribute__nonnull__(2);
+static int find_builtin(const char *func)
+    __attribute__nonnull__(1);
 static int find_builtin_s(Interp *interp, STRING *func)
+    __attribute__nonnull__(1)
+    __attribute__nonnull__(2);
+static int check_builtin_sig(size_t i, const char *sig, int pass)
     __attribute__nonnull__(2);
-static int check_builtin_sig(Interp *interp, size_t i,
-                             const char *sig, int pass)
-    __attribute__nonnull__(3);
 
 static int
-find_builtin(Interp *interp, const char *func /*NN*/)
+find_builtin(const char *func /*NN*/)
 {
     int low  = 0;
     int high = N_BUILTINS - 1;
 
     /* binary search */
-    while (low <= high)
-    {
+    while (low <= high) {
         int i   = (low + high) / 2;
-        int cmp = strcmp(func, builtins[i].c_name);
+        const int cmp = strcmp(func, builtins[i].c_name);
 
-        if (!cmp)
-        {
+        if (!cmp) {
             /* we have to loop here because there is currently more than one
                entry for the 'say' opcode and we depend on having the first
                one so we can check signatures. --mdiep */
@@ -176,8 +174,7 @@
 }
 
 static int
-check_builtin_sig(Interp *interp, size_t i,
-                  const char *sig /*NN*/, int pass)
+check_builtin_sig(size_t i, const char *sig /*NN*/, int pass)
 {
     const Builtins * const b = builtins + i;
     const char *p;
@@ -214,7 +211,7 @@
 {
     int bi, i, pass;
 
-    i = find_builtin(interp, func);
+    i = find_builtin(func);
     if (i < 0)
         return -1;
     if (!sig)
@@ -223,7 +220,7 @@
     for (pass = 0; pass <= 1; ++pass) {
         i = bi;
 again:
-        if (check_builtin_sig(interp, i, sig, pass))
+        if (check_builtin_sig(i, sig, pass))
             return i;
         if (i < N_BUILTINS - 1) {
             /* try next with same name */
@@ -254,6 +251,7 @@
 const char *
 Parrot_builtin_get_c_namespace(Interp *interp, int bi)
 {
+    UNUSED(interp);
     assert(bi >= 0 && bi < N_BUILTINS);
     return builtins[bi].c_ns;
 }
@@ -261,6 +259,7 @@
 int
 Parrot_builtin_is_class_method(Interp *interp, int bi)
 {
+    UNUSED(interp);
     assert(bi >= 0 && bi < N_BUILTINS);
     return builtins[bi].signature[2] != 'O';
 }
@@ -268,6 +267,7 @@
 int
 Parrot_builtin_is_void(Interp *interp, int bi)
 {
+    UNUSED(interp);
     assert(bi >= 0 && bi < N_BUILTINS);
     return builtins[bi].signature[0] == 'v';
 }