X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fgrs1disp.c;h=892fdf56414b52e1010adad8819a5a5c19717347;hb=c6b8edd2312a4606cc014738266059a20e3b6e61;hp=f6a64ce114fcb47e6ab475111728ed7e2c9b900c;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c;p=yaz-moved-to-github.git diff --git a/src/grs1disp.c b/src/grs1disp.c index f6a64ce..892fdf5 100644 --- a/src/grs1disp.c +++ b/src/grs1disp.c @@ -22,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 @@ -47,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) @@ -71,7 +72,7 @@ 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) {