apply Janet's lint catches to trunk

diff --git a/include/extern.h b/include/extern.h
index 37846cffd0d1fc82a1988c46467d0b2a18202da4..4afefe71df68363e5d8f0b595a4427d7bafc3a27 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1543,7 +1543,9 @@ E int FDECL(loot_mon, (struct monst *,int *,boolean *));
 E int NDECL(dotip);
 E const char *FDECL(safe_qbuf, (const char *,unsigned,
                                const char *,const char *,const char *));
+#ifdef AUTOPICKUP_EXCEPTIONS
 E boolean FDECL(is_autopickup_exception, (struct obj *, BOOLEAN_P));
+#endif /* AUTOPICKUP_EXCEPTIONS */
 
 /* ### pline.c ### */
 

diff --git a/src/dog.c b/src/dog.c
index 45073ff1e01e87e35f01a0f3e59836d2f3f84baf..0c99ff7689040f9cfbf58e671df2afa820750894 100644 (file)
--- a/src/dog.c
+++ b/src/dog.c
@@ -374,7 +374,8 @@ boolean with_you;
                    if (xlocale && ylocale)
                            place_object(obj, xlocale, ylocale);
                    else if (rloco(obj)) {
-                       get_obj_location(obj, &xlocale, &ylocale, 0);
+                       if (!get_obj_location(obj, &xlocale, &ylocale, 0))
+                           impossible("Can't find relocated object.");
                    }
                }
                corpse = mkcorpstat(CORPSE, (struct monst *)0, mtmp->data,

diff --git a/src/eat.c b/src/eat.c
index 85b872e1cbd4c794a7d1a185aff1f789792924d0..55fbcc3e66b06d82a99651f20759297843714b78 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -894,7 +894,7 @@ register int pm;
                if (dmgtype(ptr, AD_STUN) || dmgtype(ptr, AD_HALU) ||
                    pm == PM_VIOLET_FUNGUS) {
                        pline ("Oh wow!  Great stuff!");
-                       make_hallucinated(HHallucination + 200,FALSE,0L);
+                       (void) make_hallucinated(HHallucination + 200,FALSE,0L);
                }
                if(is_giant(ptr)) gainstr((struct obj *)0, 0);
 

diff --git a/src/polyself.c b/src/polyself.c
index f7720d046a1899007c513c070f3cf2b60d3d7bf0..d807d8c843387a1e08df18dff347d42b511db7da 100644 (file)
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -329,7 +329,8 @@ boolean forcecontrol;
        }
        if (is_pool(u.ux,u.uy) && was_floating && !(Levitation || Flying) &&
                !breathless(youmonst.data) && !amphibious(youmonst.data) &&
-               !Swimming) drown();
+               !Swimming)
+           (void) drown();
 }
 
 /* (try to) make a mntmp monster out of the player */