Some more linter warnings

diff --git a/Makefile b/Makefile
index a435d0780a90a1cc3f556888745d8699d5356a23..c5ce654163a0bef2d33b757ba7fe692775a4e4c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ newdb.c newdb.h: newdungeon.py adventure.yaml
        python3 newdungeon.py
 
 linenoise.o:   linenoise/linenoise.h
-       $(CC) -c linenoise/linenoise.c
+       $(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 dungeon: dungeon.o common.o
        $(CC) $(CCFLAGS) -o $@ dungeon.o common.o

diff --git a/actions.c b/actions.c
index 16d303f10d60c216b128eca5a17af5ec2e9ee2a7..6189c36522443334bae0923827eacacf8a6aa584 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -14,7 +14,7 @@ static int attack(FILE *input, struct command_t *command)
 {
     vocab_t verb = command->verb;
     vocab_t obj = command->obj;
-    int spk = actions[verb].message;
+    long spk = actions[verb].message;
     if (obj == 0 || obj == INTRANSITIVE) {
         if (atdwrf(game.loc) > 0)
             obj = DWARF;

diff --git a/dungeon.c b/dungeon.c
index 725152d44c096166a6f6765a16eb35fa000ce6a0..5f490688da56f504d1e40bed95a0904464d04df0 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -159,7 +159,7 @@ static long GETNUM(FILE *source)
      *  scanned).  If we're at the end of the line or encounter an illegal
      *  character (not a digit, hyphen, or blank), we return 0. */
 
-    long DIGIT, GETNUM, sign;
+    long GETNUM, sign;
 
     if (source != NULL) MAPLIN(source);
     GETNUM = 0;
@@ -176,7 +176,7 @@ static long GETNUM(FILE *source)
         LNPOSN = LNPOSN + 1;
     }
     while (!(LNPOSN > LNLENG || INLINE[LNPOSN] == 0)) {
-        DIGIT = INLINE[LNPOSN] - 64;
+        long DIGIT = INLINE[LNPOSN] - 64;
         if (DIGIT < 0 || DIGIT > 9) {
             GETNUM = 0;
             break;

diff --git a/misc.c b/misc.c
index 0b28f00a2411e4b1673e9836b604c9c24f22be31..45528c20dd2e7485a4c93c85964ea19bbf0e6497 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -535,7 +535,7 @@ long atdwrf(long where)
 long setbit(long bit)
 /*  Returns 2**bit for use in constructing bit-masks. */
 {
-    return (1 << bit);
+    return (1L << bit);
 }
 
 bool tstbit(long mask, int bit)