X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_util.c;h=5da40887aca8897f6527612a27f14353a8afc41a;hb=73dfa31aa3d623a2032525637ac07e78886cd4fd;hp=dc280d74dea856374f0cabb46e5c2b2559ae0b32;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/odr/odr_util.c b/odr/odr_util.c
index dc280d7..5da4088 100644
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 1995-1999, 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.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
- * 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.25 2003-05-24 19:20:14 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <yaz/odr.h>
+#include "odr-priv.h"
 #include <yaz/oid.h>
 
 void odr_prname(ODR o, const char *name)
@@ -50,7 +31,6 @@ int odp_more_chunks(ODR o, const unsigned char *base, int len)
 	if (*o->bp == 0 && *(o->bp + 1) == 0)
 	{
 	    o->bp += 2;
-	    o->left -= 2;
 	    return 0;
 	}
 	else
@@ -77,10 +57,10 @@ Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
     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))
@@ -96,8 +76,19 @@ Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *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);
 }
 
+int odr_missing(ODR o, int opt, const char *name)
+{
+    if (o->error)
+        return 0;
+    if (!opt)
+    {
+        odr_seterror(o, OREQUIRED, 53);
+        odr_setelement(o, name);
+    }
+    return opt;
+}