Updated information about YAZ.

[yaz-moved-to-github.git] / odr / odr_util.c

diff --git a/odr/odr_util.c b/odr/odr_util.c
index 72b80d6..dc280d7 100644 (file)
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_util.c,v $
- * Revision 1.13  1998-02-11 11:53:34  adam
+ * Revision 1.17  1999-11-30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.16  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.15  1999/01/08 11:23:29  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.14  1998/10/13 15:58:36  adam
+ * Minor fix in odr_getoidbystr_nmem.
+ *
+ * Revision 1.13  1998/02/11 11:53:34  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.12  1997/10/31 12:20:08  adam
@@ -17,22 +30,18 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <odr.h>
-#include <oid.h>
+#include <yaz/odr.h>
+#include <yaz/oid.h>
 
-char *odr_indent(ODR o)
+void odr_prname(ODR o, const char *name)
 {
-    static char buf[512];
-    int i = o->indent;
-
-    memset(buf, ' ', 512);
-    if (i >= 128)
-       i = 127;
-    buf[o->indent * 4] = 0;
-    return buf;
+    if (name)
+       fprintf (o->print, "%*s%s ", o->indent*4, "", name);
+    else
+       fprintf (o->print, "%*s", o->indent*4, "");
 }
 
-int odp_more_chunks(ODR o, unsigned char *base, int len)
+int odp_more_chunks(ODR o, const unsigned char *base, int len)
 {
     if (!len)
        return 0;
@@ -82,7 +91,7 @@ Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *str)
     p = str;
     do
        ret[i++] = atoi(p);
-    while ((p = strchr(p, '.')) && ++p);
+    while ((p = strchr(p, '.')) && *++p);
     ret[i] = -1;
     return ret;
 }