Fix all the simple compiler warnings.

diff --git a/actions.c b/actions.c
index c25668915aa10b7aa97f62dd6a8aeb96ea5390fd..9a68f268429a0f5ed1c9c615164fc1e325996850 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -694,7 +694,6 @@ static int listen(void)
 static int lock(token_t verb, token_t obj)
 /* Lock, unlock, no object given.  Assume various things if present. */
 {
-    int k;
     int spk = ACTSPK[verb];
     if (obj == INTRANSITIVE) {
        spk=28;
@@ -989,7 +988,6 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
  *  unless verb is "say", which snarfs arbitrary second word.
  */
 {
-    int kk;
     token_t spk=ACTSPK[verb];
 
     if (part == unknown)

diff --git a/dungeon.c b/dungeon.c
index 4279dc90fc297cca51a9876ed1efbee3ef014108..1f56f84ce59eb624d2ed78483e01cd425326e916 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -29,7 +29,6 @@ static long LNLENG;
 static long LNPOSN;
 static char INLINE[LINESIZE+1];
 static long OLDLOC;
-static long MAXDIE;
 
 // Storage for what comes out of the database
 long LINUSE;

diff --git a/main.c b/main.c
index 10fce6503f348e9673b9e70add4fa4eaf3d1e61c..b5d190da2325a7363dcd0d7b9342c69472dc34f0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -904,7 +904,7 @@ static void listobjects(void)
 static bool do_command(FILE *cmdin)
 /* Get and execute a command */ 
 {
-    long KQ, VERB, KK, V1, V2;
+    long KQ, VERB, V1, V2;
     long i, k, KMOD;
     static long igo = 0;
     static long obj = 0;

diff --git a/misc.c b/misc.c
index 075e9d08eee3235b72ce8ef8b6283d8298cb880b..c47ce1d8ed4007cf8dc8e14b6c446a36e85794a8 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -27,7 +27,7 @@ void packed_to_token(long packed, char token[6])
   for (int i = 0; i < 5; ++i)
     {
       char advent = (packed >> i * 6) & 63;
-      token[4 - i] = advent_to_ascii[advent];
+      token[4 - i] = advent_to_ascii[(int) advent];
     }
 
   // Ensure the last character is \0.
@@ -648,7 +648,7 @@ void TYPE(void)
     }
 
     for (i=1; i<=LNLENG; i++) {
-       INLINE[i]=advent_to_ascii[INLINE[i]];
+      INLINE[i]=advent_to_ascii[(int) INLINE[i]];
     }
     INLINE[LNLENG+1]=0;
     printf("%s\n", INLINE+1);

diff --git a/newdb.c b/newdb.c
index 427661813be5bbc25397c4d2a5045d553f9443c6..0661543ab2ad02619ae3d404cda58dfa9df96150 100644 (file)
--- a/newdb.c
+++ b/newdb.c
@@ -526,13 +526,11 @@ object_description_s object_descriptions[] = {
   },
   {
     .inventory = "Water in the bottle",
-    .longs = (char* []) {
-    },
+    .longs = NULL,
   },
   {
     .inventory = "Oil in the bottle",
-    .longs = (char* []) {
-    },
+    .longs = NULL,
   },
   {
     .inventory = "*mirror",