projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added stop word support for CCL parser. These are configured with
[yaz-moved-to-github.git]
/
src
/
odr_oct.c
diff --git
a/src/odr_oct.c
b/src/odr_oct.c
index
8d3cc05
..
b21125a
100644
(file)
--- a/
src/odr_oct.c
+++ b/
src/odr_oct.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: odr_oct.c,v 1.8 2005-01-15 19:47:14 adam Exp $
+ * $Id: odr_oct.c,v 1.11 2007-03-19 21:08:13 adam Exp $
*/
/**
* \file odr_oct.c
*/
/**
* \file odr_oct.c
@@
-23,35
+23,36
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
int res, cons = 0;
if (o->error)
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)
if (!res)
- return odr_missing(o, opt, name);
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
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");
odr_printf(o, "\n");
- return 1;
+ return 1;
}
if (o->direction == ODR_DECODE)
{
}
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))
}
if (ber_octetstring(o, *p, cons))
- return 1;
+ return 1;
odr_seterror(o, OOTHER, 43);
return 0;
}
odr_seterror(o, OOTHER, 43);
return 0;
}
@@
-65,40
+66,41
@@
int odr_cstring(ODR o, char **p, int opt, const char *name)
Odr_oct *t;
if (o->error)
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)
if (!res)
- return odr_missing(o, opt, name);
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
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 = (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
{
}
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))
}
if (!ber_octetstring(o, t, cons))
- return 0;
+ return 0;
if (o->direction == ODR_DECODE)
{
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;
}
}
return 1;
}
@@
-112,21
+114,22
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
Odr_oct *t;
if (o->error)
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)
if (!res)
- return odr_missing(o, opt, name);
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
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 = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
if (o->direction == ODR_ENCODE)
@@
-160,12
+163,12
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
}
else
{
}
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))
}
if (!ber_octetstring(o, t, cons))
- return 0;
+ return 0;
if (o->direction == ODR_DECODE)
{
*p = 0;
if (o->direction == ODR_DECODE)
{
*p = 0;
@@
-199,3
+202,11
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
}
return 1;
}
}
return 1;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+