Add new mutex create where mutex attribute can be set

[yaz-moved-to-github.git] / src / grs1disp.c

diff --git a/src/grs1disp.c b/src/grs1disp.c
index dc5a5bd..1fd2727 100644 (file)
--- a/src/grs1disp.c
+++ b/src/grs1disp.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 
@@ -22,12 +22,14 @@ 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);
+        wrbuf_printf(w, "%*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);
+            wrbuf_printf(w, ",value=%s\n",
+                         v->triples[i]->value.internationalString);
         else
-            printf("\n");
+            wrbuf_printf(w, "\n");
     }
 }
 
@@ -47,11 +49,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 +73,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)
         {
@@ -121,12 +123,13 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
 
 void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags)
 {
-    display_grs1 (wrbuf, r, 0);
+    display_grs1(wrbuf, r, 0);
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab