- xml: <integer/> instead of <integer>0</integer> markup.

CVS patchset: 7325
CVS date: 2004/06/14 17:46:45

diff --git a/CHANGES b/CHANGES
index 043e566..5467888 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@
        - python: return ds, not tuple, for ds iteration.
        - python: permit integer keys to ts.dbMatch().
        - xml: use <foo/> markup for empty tags.
+       - xml: <integer/> instead of <integer>0</integer> markup.
 
 4.3 -> 4.3.1:
        - fix: don't add leading space to %* argv expansion (#119059).

diff --git a/lib/formats.c b/lib/formats.c
index dd87842..82cb8ad 100644 (file)
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -340,15 +340,17 @@ static /*@only@*/ char * xmlFormat(int_32 type, const void * data,
     }
 /*@=branchstate@*/
 
-/*@-branchstate@*/
     if (s == NULL) {
+/*@-branchstate@*/
+       if (anint != 0) {
        int tlen = 32;
        t = memset(alloca(tlen+1), 0, tlen+1);
        xx = snprintf(t, tlen, "%lu", anint);
        s = t;
-       xtag = "integer";
     }
 /*@=branchstate@*/
+       xtag = "integer";
+    }
 
     nb = xmlstrlen(s);
     if (nb == 0) {