Code is cppcheck clean.

diff --git a/Makefile b/Makefile
index d65ae1fa35b30c00a41d6fa75fc1ebbef614dcdd..1cdc99a8da3199885e8c3843ac3671d318610d82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ lint: $(FILES)
 
 # cppcheck should run clean
 cppcheck:
-       cppcheck --inline-suppr --template gcc --enable=all --force *.[ch]
+       cppcheck --inline-suppr --suppress=unusedStructMember --suppress=unusedFunction  --template gcc --enable=all --force *.[ch]
 
 clean:
        rm -f *.o TAGS vms-empire

diff --git a/attack.c b/attack.c
index 9071f0cf8e134cf24e84de5fb423b376b4dce823..968bcd47c29ebc16da74f198519ec79f8b3dc224 100644 (file)
--- a/attack.c
+++ b/attack.c
@@ -145,8 +145,8 @@ describe(piece_info_t *win_obj, piece_info_t *lose_obj, loc_t loc)
     *buf2 = '\0';
        
     if (win_obj->owner != lose_obj->owner) {
-       int diff;
        if (win_obj->owner == USER) {
+           int diff;
            user_score += piece_attr[lose_obj->type].build_time; 
            ksend ("Enemy %s at %d destroyed.\n",piece_attr[lose_obj->type].name,loc_disp(loc)); //kermyt
            topmsg (1, "Enemy %s at %d destroyed.",piece_attr[lose_obj->type].name,loc_disp(loc));

diff --git a/empire.c b/empire.c
index c389e68d69bfb7f72280e1b37973ad7b08de9024..7acb8efdd0a86b3a1a4a96e61cb1f8dded5a9cb5 100644 (file)
--- a/empire.c
+++ b/empire.c
@@ -55,7 +55,7 @@ empire(void)
        }
        else {
            prompt (""); /* blank top line */
-           void redisplay();
+           redisplay();
            prompt ("Your orders? ");
            order = get_chx (); /* get a command */
            do_command (order);

diff --git a/usermove.c b/usermove.c
index f2042396ec10cd7f8e6216bcbf8f167de71689d0..db2e88833e50332133900b442eebe73db6fc89bf 100644 (file)
--- a/usermove.c
+++ b/usermove.c
@@ -346,7 +346,6 @@ void
 move_ttload(piece_info_t *obj)
 {
     ABORT;
-    obj = obj;
 }
 
 /*
@@ -846,10 +845,6 @@ necessary, and attack if necessary.
 void
 user_dir_army(piece_info_t *obj, loc_t loc)
 {
-    bool enemy_killed;
-       
-    enemy_killed = false;
-
     if (user_map[loc].contents == 'O') /* attacking own city */
        move_army_to_city (obj, loc);
 
@@ -859,6 +854,8 @@ user_dir_army(piece_info_t *obj, loc_t loc)
               "Your army jumped into the briny and drowned.");
 
     else if (map[loc].contents == '.') { /* going for a swim? */
+       bool enemy_killed = false;
+
        if (!getyn ( /* thanks to Craig Hansen for this next message */
                "Troops can't walk on water, sir.  Do you really want to go to sea? "))
            return;
@@ -935,10 +932,6 @@ a city, attacking self, attacking enemy.
 void
 user_dir_ship(piece_info_t *obj, loc_t loc)
 {
-    bool enemy_killed;
-
-    enemy_killed = false;
-
     if (map[loc].contents == '*') {
        (void) sprintf (jnkbuf, "Your %s broke up on shore.",
                        piece_attr[obj->type].name);
@@ -949,6 +942,8 @@ user_dir_ship(piece_info_t *obj, loc_t loc)
     }
 
     else if (map[loc].contents == '+') { /* moving ashore? */
+       ool enemy_killed = false;
+
        if (!getyn ("Ships need sea to float, sir.  Do you really want to go ashore? ")) return;
 
        if (user_map[loc].contents == '+')