-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: odr_oct.c,v 1.5 2004-10-02 13:28:26 adam Exp $
+ */
+/**
+ * \file odr_oct.c
+ * \brief Implements ODR OCTET codec
*/
#if HAVE_CONFIG_H
#include <config.h>
#endif
-#include <yaz/log.h>
#include "odr-priv.h"
/*
int res, cons = 0;
if (o->error)
- return 0;
- if (o->t_class < 0)
+ return 0;
+ if (o->op->t_class < 0)
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_OCTETSTRING;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_OCTETSTRING;
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
- return 0;
+ res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+ if (res < 0)
+ return 0;
if (!res)
- return odr_missing(o, opt, name);
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
- odr_prname(o, name);
- odr_printf(o, "OCTETSTRING(len=%d) ", (*p)->len);
+ odr_prname(o, name);
+ odr_printf(o, "OCTETSTRING(len=%d) ", (*p)->len);
- o->op->stream_write(o, o->print, ODR_OCTETSTRING,
- (char*) (*p)->buf, (*p)->len);
+ o->op->stream_write(o, o->op->print, ODR_OCTETSTRING,
+ (char*) (*p)->buf, (*p)->len);
odr_printf(o, "\n");
- return 1;
+ 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;
+ *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;
+ return 1;
odr_seterror(o, OOTHER, 43);
return 0;
}
Odr_oct *t;
if (o->error)
- return 0;
- if (o->t_class < 0)
+ return 0;
+ if (o->op->t_class < 0)
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_OCTETSTRING;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_OCTETSTRING;
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
- return 0;
+ res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+ if (res < 0)
+ return 0;
if (!res)
- return odr_missing(o, opt, name);
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
- odr_prname(o, name);
- odr_printf(o, "'%s'\n", *p);
- return 1;
+ odr_prname(o, name);
+ odr_printf(o, "'%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);
+ t->buf = (unsigned char *) *p;
+ t->size = t->len = strlen(*p);
}
else
{
- t->size= 0;
- t->len = 0;
- t->buf = 0;
+ t->size= 0;
+ t->len = 0;
+ t->buf = 0;
}
if (!ber_octetstring(o, t, cons))
- return 0;
+ return 0;
if (o->direction == ODR_DECODE)
{
- *p = (char *) t->buf;
- *(*p + t->len) = '\0'; /* ber_octs reserves space for this */
+ *p = (char *) t->buf;
+ *(*p + t->len) = '\0'; /* ber_octs reserves space for this */
}
return 1;
}
Odr_oct *t;
if (o->error)
- return 0;
- if (o->t_class < 0)
+ return 0;
+ if (o->op->t_class < 0)
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_OCTETSTRING;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_OCTETSTRING;
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
- return 0;
+ res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+ if (res < 0)
+ return 0;
if (!res)
- return odr_missing(o, opt, name);
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
- odr_prname(o, name);
- odr_printf(o, "'%s'\n", *p);
- return 1;
+ odr_prname(o, name);
+ odr_printf(o, "'%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 *) outbuf;
- ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
- &outbuf, &outleft);
+ ret = yaz_iconv(o->op->iconv_handle, &inbuf, &inleft,
+ &outbuf, &outleft);
+ if (ret == (size_t)(-1))
+ {
+ odr_seterror(o, ODATA, 44);
+ return 0;
+ }
+ ret = yaz_iconv(o->op->iconv_handle, 0, 0,
+ &outbuf, &outleft);
+
if (ret == (size_t)(-1))
{
odr_seterror(o, ODATA, 44);
}
else
{
- t->size= 0;
- t->len = 0;
- t->buf = 0;
+ t->size= 0;
+ t->len = 0;
+ t->buf = 0;
}
if (!ber_octetstring(o, t, cons))
- return 0;
+ return 0;
if (o->direction == ODR_DECODE)
{
*p = 0;
odr_seterror(o, ODATA, 45);
return 0;
}
+ ret = yaz_iconv(o->op->iconv_handle, 0, 0,
+ &outbuf, &outleft);
+ if (ret == (size_t)(-1))
+ {
+ odr_seterror(o, ODATA, 45);
+ return 0;
+ }
inleft = outbuf - (char*) *p;
(*p)[inleft] = '\0'; /* null terminate it */
}
return 1;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+