Update copyright notice

[empserver] / src / lib / common / xdump.c

diff --git a/src/lib/common/xdump.c b/src/lib/common/xdump.c
index 43a3d83a6ea6b5a830b7f864af2823cd82cc3038..124f1447caf4ab3031dd04ebebf2f6c9f6fd79a8 100644 (file)
--- a/src/lib/common/xdump.c
+++ b/src/lib/common/xdump.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -28,7 +27,7 @@
  *  xdump.c: Extended dumps
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2013
  */
 
 /*
@@ -85,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;
 }
@@ -182,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);
     }
@@ -308,35 +312,3 @@ xdftr(struct xdstr *xd, int n)
     else
        xd->pr("/%d\n", n);
 }
-
-/*
- * Dump meta-data for items of type TYPE to XD.
- * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
- */
-int
-xdmeta(struct xdstr *xd, int type)
-{
-    struct castr *ca = ef_cadef(type);
-    int i;
-    int n = 0;
-
-    if (!ca)
-       return RET_SYN;
-
-    xdhdr(xd, ef_nameof(type), 1);
-    xdcolhdr(xd, ca);
-
-    for (i = 0; ca[i].ca_name; i++) {
-       if (ca[i].ca_flags & NSC_DEITY && !xd->divine)
-           continue;
-       if (ca[i].ca_flags & NSC_EXTRA)
-           continue;
-       xdflds(xd, mdchr_ca, &ca[i]);
-       xd->pr("\n");
-       n++;
-    }
-
-    xdftr(xd, n);
-
-    return RET_OK;
-}