X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_read.c;h=742e170c0c2bafb2946fe5f04157533c2d5b8b7c;hb=cc4289d73c2b872c09d221d5e1188d3cdd9da438;hp=c1e88601873a57d0fb6e31de06963184a654b492;hpb=42b9e1d0ec4a98637b142d127765f28ecd86b64b;p=idzebra-moved-to-github.git

diff --git a/data1/d1_read.c b/data1/d1_read.c
index c1e8860..742e170 100644
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,4 +1,4 @@
-/* $Id: d1_read.c,v 1.7 2004-07-26 12:20:07 adam Exp $
+/* $Id: d1_read.c,v 1.9 2004-08-04 08:35:22 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -301,14 +301,10 @@ data1_node *data1_mk_tag_n (data1_handle dh, NMEM nmem,
 void data1_tag_add_attr (data1_handle dh, NMEM nmem,
                          data1_node *res, const char **attr)
 {
-    data1_xattr **p;
-
     if (res->which != DATA1N_tag)
         return;
 
-    p = &res->u.tag.attributes;
-    data1_add_attrs(dh, nmem, attr, p);
-    *p = 0;
+    data1_add_attrs(dh, nmem, attr, &res->u.tag.attributes);
 }
 
 data1_node *data1_mk_tag (data1_handle dh, NMEM nmem,
@@ -474,8 +470,8 @@ data1_node *data1_add_taggeddata (data1_handle dh, data1_node *root,
     return data1_add_insert_taggeddata (dh, at, tagname, m, 1, 0);
 }
 
-data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
-                                   const char *tag, int num,
+data1_node *data1_mk_tag_data_zint (data1_handle dh, data1_node *at,
+                                   const char *tag, zint num,
                                    NMEM nmem)
 {
     data1_node *node_data;
@@ -485,11 +481,18 @@ data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
 	return 0;
     node_data->u.data.what = DATA1I_num;
     node_data->u.data.data = node_data->lbuf;
-    sprintf (node_data->u.data.data, "%d", num);
+    sprintf (node_data->u.data.data, ZINT_FORMAT, num);
     node_data->u.data.len = strlen (node_data->u.data.data);
     return node_data;
 }
 
+data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
+                                   const char *tag, int num,
+                                   NMEM nmem)
+{
+    return data1_mk_tag_data_zint(dh, at, tag, num, nmem);
+}
+
 data1_node *data1_mk_tag_data_oid (data1_handle dh, data1_node *at,
                                    const char *tag, Odr_oid *oid,
                                    NMEM nmem)