/*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: odr_util.c,v $
- * 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
- * Improved memory debugging for xmalloc/nmem.c. References to NMEM
- * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
- * Bug fix: missing fclose in data1_read_espec1.
*
+ * $Id: odr_util.c,v 1.22 2003-01-06 08:20:28 adam Exp $
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <odr.h>
-#include <oid.h>
+#include "odr-priv.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;
if (*o->bp == 0 && *(o->bp + 1) == 0)
{
o->bp += 2;
- o->left -= 2;
return 0;
}
else
return odr_oiddup_nmem (odr->mem, o);
}
-Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *str)
+Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
{
int num = 1, i = 0;
- char *p = str;
+ const char *p = str;
Odr_oid *ret;
if (!isdigit(*str))
return ret;
}
-Odr_oid *odr_getoidbystr(ODR o, char *str)
+Odr_oid *odr_getoidbystr(ODR o, const char *str)
{
return odr_getoidbystr_nmem (o->mem, str);
}
+