Fix more compiler warnings

parrot · Dec 31, 2010 · fbbcdad · fbbcdad
1 parent b3e5f5e
commit fbbcdad
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/compilers/imcc/optimizer.c b/compilers/imcc/optimizer.c
@@ -803,7 +803,7 @@ eval_ins(PARROT_INTERP, ARGIN(const char *op), size_t ops, ARGIN(SymReg **r))
     ASSERT_ARGS(eval_ins)
     opcode_t eval[4], *pc;
     int i;
-    op_info_t *op_info = (op_info_t *)parrot_hash_get(interp, interp->op_hash, (void *)op);
+    op_info_t *op_info = (op_info_t *)parrot_hash_get(interp, interp->op_hash, op);
     if (!op_info || !STREQ(op_info->full_name, op))
         IMCC_fatal(interp, 1, "eval_ins: op '%s' not found\n", op);
     /* now fill registers */

diff --git a/compilers/imcc/parser_util.c b/compilers/imcc/parser_util.c
@@ -230,7 +230,7 @@ int
 is_op(PARROT_INTERP, ARGIN(const char *name))
 {
     ASSERT_ARGS(is_op)
-    return parrot_hash_exists(interp, interp->op_hash, (void *)name);
+    return parrot_hash_exists(interp, interp->op_hash, name);
 }
 
 /*

diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -1068,14 +1068,9 @@ $(INSTALLABLEPDB) : frontend/parrot_debugger/main$(O) $(LIBPARROT) src/parrot_co
 #
 
 src/pbc_disassemble$(O) : \
+    $(PARROT_H_HEADERS) \
     $(INC_DIR)/api.h \
-    $(INC_DIR)/compiler.h \
-    $(INC_DIR)/config.h \
-    $(INC_DIR)/core_types.h \
-    $(INC_DIR)/feature.h \
-    $(INC_DIR)/has_header.h \
     $(INC_DIR)/longopt.h \
-    $(INC_DIR)/platform_limits.h \
     src/pbc_disassemble.c \
 
 $(DIS) : src/pbc_disassemble$(O) $(LIBPARROT)

diff --git a/include/parrot/hash.h b/include/parrot/hash.h
@@ -152,7 +152,7 @@ PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 INTVAL parrot_hash_exists(PARROT_INTERP,
     ARGIN(const Hash *hash),
-    ARGIN(void *key))
+    ARGIN(const void *key))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3);

diff --git a/src/hash.c b/src/hash.c
@@ -1336,7 +1336,8 @@ parrot_hash_get(PARROT_INTERP, ARGIN(const Hash *hash), ARGIN(const void *key))
 
 /*
 
-=item C<INTVAL parrot_hash_exists(PARROT_INTERP, const Hash *hash, void *key)>
+=item C<INTVAL parrot_hash_exists(PARROT_INTERP, const Hash *hash, const void
+*key)>
 
 Returns whether the key exists in the hash.
 
@@ -1347,7 +1348,7 @@ Returns whether the key exists in the hash.
 PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 INTVAL
-parrot_hash_exists(PARROT_INTERP, ARGIN(const Hash *hash), ARGIN(void *key))
+parrot_hash_exists(PARROT_INTERP, ARGIN(const Hash *hash), ARGIN(const void *key))
 {
     ASSERT_ARGS(parrot_hash_exists)
     const HashBucket * const bucket = parrot_hash_get_bucket(interp, hash, key);

diff --git a/src/pbc_disassemble.c b/src/pbc_disassemble.c
@@ -28,7 +28,7 @@ Without non-option arguments it reads the pbc from STDIN.
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "parrot/api.h"
+#include "parrot/parrot.h"
 #include "parrot/longopt.h"
 
 #define PFOPT_UTILS 1

diff --git a/tools/dev/nci_thunk_gen.pir b/tools/dev/nci_thunk_gen.pir
@@ -404,7 +404,8 @@ DECL
 
     $S0 = 'get_dynext_loader_decl'(sigs)
     $S1 = 'get_loader_body'(sigs)
-    $S2 = 'sprintf'(<<'LOADER', $S0, $S1)
+    $S2 = 'sprintf'(<<'LOADER', $S0, $S0, $S1)
+%s;
 %s {
 %s
 }