(CANT_REACH): New. Use it instead of CANT_HAPPEN() where possible.

(oops): Cope with NULL argument passed by CANT_REACH().
This commit is contained in:
Markus Armbruster 2006-04-17 17:36:07 +00:00
parent 98d35dec3e
commit 6fee3f4535
13 changed files with 26 additions and 19 deletions

View file

@ -273,7 +273,7 @@ buil(void)
built = build_plane(&sect, pp, sect.sct_item, tlev);
break;
default:
CANT_HAPPEN("Bad WHAT");
CANT_REACH();
return RET_FAIL;
}
if (built) {

View file

@ -337,7 +337,7 @@ gift(natid givee, natid giver, void *ptr, int type, char *mesg)
p = prland(ptr);
break;
default:
CANT_HAPPEN("bad TYPE");
CANT_REACH();
p = "a red herring";
}

View file

@ -296,7 +296,7 @@ prod(void)
pr(" %4.0f ", real);
break;
default:
CANT_HAPPEN("bad TYPE");
CANT_REACH();
pr(" ??? ");
break;
}

View file

@ -142,7 +142,7 @@ xdprval(struct valstr *val, char *sep)
pr("%snil", sep);
break;
default:
CANT_HAPPEN("Bad VAL type");
CANT_REACH();
pr("0");
}
return " ";