empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

empdump: Don't abort() on unresolvable symbols

Browse source 
empdump flags them since commit 2a5d12b (v4.3.28), but still aborts.
Avoid the abort.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-06-01 10:36:33 +02:00
parent 9ca3fa95b8
commit edfb80a1f7
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/common/xdump.c
View file

@ -27,7 +27,7 @@
* xdump.c: Extended dumps
*
* Known contributors to this file:
* Markus Armbruster, 2004-2010
* Markus Armbruster, 2004-2013
*/
/*
@ -84,15 +84,19 @@
* Initialize XD.
* Translate dump for country CNUM, except when CNUM is NATID_BAD.
* If HUMAN, dump in human-readable format.
* If SLOPPY, try to cope with invalid data (may result in invalid
* dump).
* Dump is to be delivered through callback PR.
* Return XD.
*/
struct xdstr *
xdinit(struct xdstr *xd, natid cnum, int human, void (*pr)(char *fmt, ...))
xdinit(struct xdstr *xd, natid cnum, int human, int sloppy,
void (*pr)(char *fmt, ...))
{
xd->cnum = cnum;
xd->divine = cnum == NATID_BAD || getnatp(cnum)->nat_stat == STAT_GOD;
xd->human = human;
xd->sloppy = sloppy;
xd->pr = pr;
return xd;
}
@ -181,9 +185,10 @@ xdprsym(struct xdstr *xd, int key, int type, char *sep)
{
char *sym = symbol_by_value(key, ef_ptr(type, 0));
if (CANT_HAPPEN(!sym))
if (!sym) {
CANT_HAPPEN(!xd->sloppy);
xd->pr("%s%d", sep, key);
else {
} else {
xd->pr("%s", sep);
xdpresc(xd, sym, INT_MAX);
}