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

diff --git a/odr/ber_any.c b/odr/ber_any.c
deleted file mode 100644
index 73f8dfb..0000000
--- a/odr/ber_any.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 1995-2003, Index Data
- * See the file LICENSE for details.
- *
- * $Id: ber_any.c,v 1.27 2003-10-21 09:30:32 adam Exp $
- */
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <assert.h>
-#include "odr-priv.h"
-
-int ber_any(ODR o, Odr_any **p)
-{
-    int res;
-    
-    switch (o->direction)
-    {
-    case ODR_DECODE:
-        if ((res = completeBER(o->bp, odr_max(o))) <= 0)        /* FIX THIS */
-        {
-            odr_seterror(o, OPROTO, 2);
-            return 0;
-        }
-        (*p)->buf = (unsigned char *)odr_malloc(o, res);
-        memcpy((*p)->buf, o->bp, res);
-        (*p)->len = (*p)->size = res;
-        o->bp += res;
-        return 1;
-    case ODR_ENCODE:
-        if (odr_write(o, (*p)->buf, (*p)->len) < 0)
-            return 0;
-        return 1;
-    default: odr_seterror(o, OOTHER, 3); return 0;
-    }
-}
-
-#define BER_ANY_DEBUG 0
-
-/*
- * Return length of BER-package or 0.
- */
-int completeBER_n(const unsigned char *buf, int len, int level)
-{
-    int res, ll, zclass, tag, cons;
-    const unsigned char *b = buf;
-    int bad = 0;
-    
-    if (len > 5000000 || level > 1000)
-    {
-	bad = 1;
-#if BER_ANY_DEBUG
-	yaz_log(LOG_LOG, "completeBER lev=%d len=%d", level, len);
-#endif
-	if (level > 1000)
-	    return -2;
-    }
-    if (len < 2)
-    	return 0;
-    if (!buf[0] && !buf[1])
-    	return -2;
-    if ((res = ber_dectag(b, &zclass, &tag, &cons, len)) <= 0)
-    	return 0;
-#if 0
-/* removed, since ber_dectag never reads that far .. */
-    if (res > len)
-    	return 0;
-#endif
-    b += res;
-    len -= res;
-    assert (len >= 0);
-    res = ber_declen(b, &ll, len);
-    if (res == -2)
-    {
-#if BER_ANY_DEBUG
-	if (bad)
-	    yaz_log(LOG_LOG, "<<<<<<<<< return1 lev=%d res=%d", level, res);
-#endif
-	return -1;  /* error */
-    }
-    if (res == -1)  
-    {
-#if BER_ANY_DEBUG
-	if (bad)
-	    yaz_log(LOG_LOG, "<<<<<<<<< return3 lev=%d res=-1", level);
-#endif
-	return 0;    /* incomplete length */
-    }
-    if (ll > 5000000)
-    {
-#if BER_ANY_DEBUG
-	if (bad)
-	    yaz_log(LOG_LOG, "<<<<<<<<< return2 lev=%d len=%d res=%d ll=%d",
-		    level, len, res, ll);
-#endif
-	return -1;  /* error */
-    }
-#if 0
-/* no longer necessary, since ber_declen never reads that far (returns -1) */
-    if (res > len)
-    {
-	if (bad)
-	    yaz_log(LOG_LOG, "<<<<<<<<< return4 lev=%d res=%d len=%d",
-		    level, res, len);
-    	return 0;
-    }
-#endif
-    b += res;
-    len -= res;
-    if (ll >= 0)
-    {   /* definite length */
-#if BER_ANY_DEBUG
-	if (bad && len < ll)
-	    yaz_log(LOG_LOG, "<<<<<<<<< return5 lev=%d len=%d ll=%d",
-		    level, len, ll);
-#endif
-    	return (len >= ll ? ll + (b-buf) : 0);
-    }
-    /* indefinite length */
-    if (!cons)
-    {   /* if primitive, it's an error */
-#if BER_ANY_DEBUG
-	yaz_log(LOG_LOG, "<<<<<<<<< return6 lev=%d ll=%d len=%d res=%d",
-		level, ll, len, res);
-#endif
-    	return -1;   /* error */
-    }
-    /* constructed - cycle through children */
-    while (len >= 2)
-    {
-	if (b[0] == 0 && b[1] == 0)
-	    break;
-	if (!(res = completeBER_n(b, len, level+1)))
-	    return 0;
-	if (res == -1)
-	    return -1;
-	b += res;
-	len -= res;
-    }
-    if (len < 2)
-    	return 0;
-    return (b - buf) + 2;
-}
-
-int completeBER(const unsigned char *buf, int len)
-{
-    int res = completeBER_n(buf, len, 0);
-    if (res < 0)
-	return len;
-    return res;
-}