X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fgrs1disp.c;h=3f6b5407abb366bb6e4583b71a881783d506ad0d;hb=80fee38926477efd73c739731c5670d59c5d1bf7;hp=43a5fa53cb2ba681da336b95a197ed757741ac8b;hpb=7a4064cd15f6c6b34c1180e1bc51f0d0e90da320;p=yaz-moved-to-github.git

diff --git a/src/grs1disp.c b/src/grs1disp.c
index 43a5fa5..3f6b540 100644
--- a/src/grs1disp.c
+++ b/src/grs1disp.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: grs1disp.c,v 1.7 2007-04-12 13:52:57 adam Exp $
  */
 
 /**
@@ -24,8 +22,9 @@ static void display_variant(WRBUF w, Z_Variant *v, int level)
 
     for (i = 0; i < v->num_triples; i++)
     {
-        printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass,
-            *v->triples[i]->type);
+        printf("%*sclass=" ODR_INT_PRINTF ",type=" ODR_INT_PRINTF,
+               level * 4, "", *v->triples[i]->zclass,
+               *v->triples[i]->type);
         if (v->triples[i]->which == Z_Triple_internationalString)
             printf(",value=%s\n", v->triples[i]->value.internationalString);
         else
@@ -49,11 +48,11 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
         t = r->elements[i];
         wrbuf_printf(w, "(");
         if (t->tagType)
-            wrbuf_printf(w, "%d,", *t->tagType);
+            wrbuf_printf(w, ODR_INT_PRINTF, *t->tagType);
         else
             wrbuf_printf(w, "?,");
         if (t->tagValue->which == Z_StringOrNumeric_numeric)
-            wrbuf_printf(w, "%d) ", *t->tagValue->u.numeric);
+            wrbuf_printf(w, ODR_INT_PRINTF ") ", *t->tagValue->u.numeric);
         else
             wrbuf_printf(w, "%s) ", t->tagValue->u.string);
         if (t->content->which == Z_ElementData_subtree)
@@ -73,16 +72,16 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
         }
         else if (t->content->which == Z_ElementData_numeric)
         {
-            wrbuf_printf(w, "%d\n", *t->content->u.numeric);
+            wrbuf_printf(w, ODR_INT_PRINTF "\n", *t->content->u.numeric);
         }
         else if (t->content->which == Z_ElementData_oid)
         {
-            int *ip = t->content->u.oid;
+            Odr_oid *ip = t->content->u.oid;
 
             if (ip)
             {
                 char oid_name_str[OID_STR_MAX];
-                int oclass;
+                oid_class oclass;
                 const char *oid_name 
                     = yaz_oid_to_string_buf(ip, &oclass, oid_name_str);
             
@@ -129,6 +128,7 @@ void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab