X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_tag.c;fp=odr%2Fber_tag.c;h=0000000000000000000000000000000000000000;hb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9;hp=98b8a95c13d03127e887041e7b5a87520c0b9ddd;hpb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;p=yaz-moved-to-github.git

diff --git a/odr/ber_tag.c b/odr/ber_tag.c
deleted file mode 100644
index 98b8a95..0000000
--- a/odr/ber_tag.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1995-2003, Index Data
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: ber_tag.c,v 1.27 2003-05-24 19:20:14 adam Exp $
- */
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include "odr-priv.h"
-
-/* ber_tag
- * On encoding:
- *	if  p: write tag. return 1 (success) or -1 (error).
- *	if !p: return 0.
- * On decoding:
- *      if tag && zclass match up, advance pointer and return 1. set cons.
- *      else leave pointer unchanged. Return 0.
- *
- * Should perhaps be odr_tag?
- */
-int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
-            const char *name)
-{
-    struct Odr_ber_tag *odr_ber_tag = &o->op->odr_ber_tag;
-    int rd;
-    char **pp = (char **)p;
-
-    if (o->direction == ODR_DECODE)
-    	*pp = 0;
-    o->t_class = -1;
-    if (o->op->stackp < 0)
-    {
-    	odr_seek(o, ODR_S_SET, 0);
-        o->top = 0;
-    	o->bp = o->buf;
-        odr_ber_tag->lclass = -1;
-    }
-    switch (o->direction)
-    {
-    case ODR_ENCODE:
-        if (!*pp)
-        {
-            if (!opt)
-            {
-                odr_seterror(o, OREQUIRED, 24);
-                odr_setelement (o, name);
-            }
-            return 0;
-        }
-        if ((rd = ber_enctag(o, zclass, tag, *constructed)) < 0)
-            return -1;
-#ifdef ODR_DEBUG
-        fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", zclass, tag,
-                *constructed, o->stackp);
-#endif
-        return 1;
-        
-    case ODR_DECODE:
-        if (o->op->stackp > -1 && !odr_constructed_more(o))
-        {
-            if (!opt)
-            {
-                odr_seterror(o, OREQUIRED, 25);
-                odr_setelement(o, name);
-            }
-            return 0;
-        }
-        if (odr_ber_tag->lclass < 0)
-        {
-            if ((odr_ber_tag->br =
-                 ber_dectag(o->bp, &odr_ber_tag->lclass,
-                            &odr_ber_tag->ltag, &odr_ber_tag->lcons,
-                            odr_max(o))) <= 0)
-            {
-                odr_seterror(o, OPROTO, 26);
-                odr_setelement(o, name);
-                return 0;
-            }
-#ifdef ODR_DEBUG
-            fprintf(stderr,
-                    "\n[class=%d,tag=%d,cons=%d,stackp=%d]",
-                    odr_ber_tag->lclass, odr_ber_tag->ltag,
-                    odr_ber_tag->lcons, o->stackp);
-#endif
-        }
-        if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
-        {
-            o->bp += odr_ber_tag->br;
-            *constructed = odr_ber_tag->lcons;
-            odr_ber_tag->lclass = -1;
-            return 1;
-        }
-        else
-        {
-            if (!opt)
-            {
-                odr_seterror(o, OREQUIRED, 27);
-                odr_setelement(o, name);
-            }
-            return 0;
-        }
-    case ODR_PRINT:
-        if (!*pp && !opt)
-        {
-            odr_seterror(o,OREQUIRED, 28);
-            odr_setelement(o, name);
-        }
-        return *pp != 0;
-    default:
-        odr_seterror(o, OOTHER, 29);
-        odr_setelement(o, name);
-        return 0;
-    }
-}
-
-/* ber_enctag
- * BER-encode a zclass/tag/constructed package (identifier octets). Return
- * number of bytes encoded, or -1 if out of bounds.
- */
-int ber_enctag(ODR o, int zclass, int tag, int constructed)
-{
-    int cons = (constructed ? 1 : 0), n = 0;
-    unsigned char octs[sizeof(int)], b;
-
-    b = (zclass << 6) & 0XC0;
-    b |= (cons << 5) & 0X20;
-    if (tag <= 30)
-    {
-    	b |= tag & 0X1F;
-	if (odr_putc(o, b) < 0)
-	    return -1;
-    	return 1;
-    }
-    else
-    {
-	b |= 0X1F;
-	if (odr_putc(o, b) < 0)
-	    return -1;
-	do
-    	{
-	    octs[n++] = tag & 0X7F;
-	    tag >>= 7;
-	}
-	while (tag);
-	while (n--)
-	{
-	    unsigned char oo;
-
-	    oo = octs[n] | ((n > 0) << 7);
-	    if (odr_putc(o, oo) < 0)
-	    	return -1;
-	}
-	return 0;
-    }
-}
-
-/* ber_dectag
- * Decode BER identifier octets. Return number of bytes read or -1 for error.
- */
-int ber_dectag(const unsigned char *b, int *zclass, int *tag,
-               int *constructed, int max)
-{
-    int l = 1;
-
-    if (l > max)
-        return -1;
-
-    *zclass = *b >> 6;
-    *constructed = (*b >> 5) & 0X01;
-    if ((*tag = *b & 0x1F) <= 30)
-    	return 1;
-    *tag = 0;
-    do
-    {
-        if (l >= max)
-            return -1;
-    	*tag <<= 7;
-    	*tag |= b[l] & 0X7F;
-    }
-    while (b[l++] & 0X80);
-    return l;
-}