/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* xdump.c: Extended dumps
- *
+ *
* Known contributors to this file:
* Markus Armbruster, 2004-2008
*/
* PTR points to the context object.
* IDX is the index within the attribute.
*/
-struct valstr *
+static struct valstr *
xdeval(struct valstr *val, struct xdstr *xd,
struct castr *ca, void *ptr, int idx)
{
* CA describes the field from which the value was fetched.
*/
static char *
-xdprval_sym(struct xdstr *xd, struct valstr *val, struct castr *ca, char *sep)
+xdprval_sym(struct xdstr *xd, struct valstr *val, struct castr *ca,
+ char *sep)
{
unsigned long bit;
- struct castr *ca_sym = ef_cadef(ca->ca_table);
if (CANT_HAPPEN(val->val_cat != NSC_VAL)) {
xd->pr("%snil", sep);
}
if (!xd->human || val->val_type != NSC_LONG
- || ca->ca_table == EF_BAD || ca_sym != symbol_ca)
+ || ca->ca_table == EF_BAD || ef_cadef(ca->ca_table) != symbol_ca)
return xdprval_nosym(xd, val, sep);
if (ca->ca_flags & NSC_BITS) {
return xdprsym(xd, val->val_as.lng, ca->ca_table, sep);
}
-/*
- * Dump VAL prefixed with SEP to XD, return " ".
- * XD must not be human-readable.
- * VAL must be evaluated.
- */
-char *
-xdprval(struct xdstr *xd, struct valstr *val, char *sep)
-{
- CANT_HAPPEN(xd->human);
- return xdprval_nosym(xd, val, sep);
-}
-
/*
* Dump field values of a context object to XD.
* CA[] describes fields.
/*
* Dump meta-data for items of type TYPE to XD.
- * Return RET_OK.
+ * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
*/
int
xdmeta(struct xdstr *xd, int type)