Source restructure. yaz-marcdump part of installation

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

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
deleted file mode 100644 (file)
index c0458dd..0000000
--- a/odr/odr_oct.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 1995-2003, Index Data
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: odr_oct.c,v 1.22 2003-05-20 19:55:30 adam Exp $
- */
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <yaz/log.h>
-#include "odr-priv.h"
-
-/*
- * Top level octet string en/decoder.
- * Returns 1 on success, 0 on error.
- */
-int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
-{
-    int res, cons = 0;
-
-    if (o->error)
-       return 0;
-    if (o->t_class < 0)
-    {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_OCTETSTRING;
-    }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
-    if (!res)
-       return odr_missing(o, opt, name);
-    if (o->direction == ODR_PRINT)
-    {
-        int i;
-       odr_prname(o, name);
-       fprintf(o->print, "OCTETSTRING(len=%d)", (*p)->len);
-        for (i = 0; i<(*p)->len; i++)
-        {
-           if (i < 5 || i > ((*p)->len - 4))
-            {
-                fprintf (o->print, " %02X", (*p)->buf[i]);
-            }
-            else if (i == 5)
-                fprintf (o->print, " .. ");
-        }
-        fprintf(o->print, "\n");
-       return 1;
-    }
-    if (o->direction == ODR_DECODE)
-    {
-       *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
-       (*p)->size= 0;
-       (*p)->len = 0;
-       (*p)->buf = 0;
-    }
-    if (ber_octetstring(o, *p, cons))
-       return 1;
-    odr_seterror(o, OOTHER, 43);
-    return 0;
-}
-
-/*
- * Friendlier interface to octetstring.
- */
-int odr_cstring(ODR o, char **p, int opt, const char *name)
-{
-    int cons = 0, res;
-    Odr_oct *t;
-
-    if (o->error)
-       return 0;
-    if (o->t_class < 0)
-    {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_OCTETSTRING;
-    }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
-    if (!res)
-       return odr_missing(o, opt, name);
-    if (o->direction == ODR_PRINT)
-    {
-       odr_prname(o, name);
-       fprintf(o->print, "'%s'\n", *p);
-       return 1;
-    }
-    t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
-    if (o->direction == ODR_ENCODE)
-    {
-       t->buf = (unsigned char *) *p;
-       t->size = t->len = strlen(*p);
-    }
-    else
-    {
-       t->size= 0;
-       t->len = 0;
-       t->buf = 0;
-    }
-    if (!ber_octetstring(o, t, cons))
-       return 0;
-    if (o->direction == ODR_DECODE)
-    {
-       *p = (char *) t->buf;
-       *(*p + t->len) = '\0';  /* ber_octs reserves space for this */
-    }
-    return 1;
-}
-
-/*
- * iconv interface to octetstring.
- */
-int odr_iconv_string(ODR o, char **p, int opt, const char *name)
-{
-    int cons = 0, res;
-    Odr_oct *t;
-
-    if (o->error)
-       return 0;
-    if (o->t_class < 0)
-    {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_OCTETSTRING;
-    }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
-    if (!res)
-       return odr_missing(o, opt, name);
-    if (o->direction == ODR_PRINT)
-    {
-       odr_prname(o, name);
-       fprintf(o->print, "'%s'\n", *p);
-       return 1;
-    }
-    t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
-    if (o->direction == ODR_ENCODE)
-    {
-        t->buf = 0;
-
-        if (o->op->iconv_handle != 0)
-        {
-            size_t inleft = strlen(*p);
-            char *inbuf = *p;
-            size_t outleft = 4 * inleft + 2;
-            char *outbuf = (char *) odr_malloc (o, outleft);
-            size_t ret;
-            
-            t->buf = (unsigned char *) outbuf;
-            
-            ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
-                             &outbuf, &outleft);
-            if (ret == (size_t)(-1))
-            {
-                odr_seterror(o, ODATA, 44);
-                return 0;
-            }
-            t->size = t->len = outbuf - (char*) t->buf;
-        }
-        if (!t->buf)
-        {
-            t->buf = (unsigned char *) *p;
-            t->size = t->len = strlen(*p);
-        }
-    }
-    else
-    {
-       t->size= 0;
-       t->len = 0;
-       t->buf = 0;
-    }
-    if (!ber_octetstring(o, t, cons))
-       return 0;
-    if (o->direction == ODR_DECODE)
-    {
-        *p = 0;
-
-        if (o->op->iconv_handle != 0)
-        {
-            size_t inleft = t->len;
-            char *inbuf = (char *) t->buf;
-            size_t outleft = 4 * inleft + 2;
-            char *outbuf = (char *) odr_malloc (o, outleft);
-            size_t ret;
-
-            *p = outbuf;
-            
-            ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
-                             &outbuf, &outleft);
-            if (ret == (size_t)(-1))
-            {
-                odr_seterror(o, ODATA, 45);
-                return 0;
-            }
-            inleft = outbuf - (char*) *p;
-            
-            (*p)[inleft] = '\0';    /* null terminate it */
-        }
-        if (!*p)
-        {
-            *p = (char *) t->buf;
-            *(*p + t->len) = '\0';  /* ber_octs reserves space for this */
-        }
-    }
-    return 1;
-}