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
SRU support for frontend server
[yaz-moved-to-github.git]
/
odr
/
odr.c
diff --git
a/odr/odr.c
b/odr/odr.c
index
6a73b62
..
7bd3fae
100644
(file)
--- a/
odr/odr.c
+++ b/
odr/odr.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: odr.c,v 1.37 2002-08-28 08:12:49 adam Exp $
+ * $Id: odr.c,v 1.41 2003-03-11 11:03:31 adam Exp $
*
*/
#if HAVE_CONFIG_H
*
*/
#if HAVE_CONFIG_H
@@
-35,7
+35,8
@@
char *odr_errlist[] =
"Malformed data",
"Stack overflow",
"Length of constructed type different from sum of members",
"Malformed data",
"Stack overflow",
"Length of constructed type different from sum of members",
- "Overflow writing definite length of constructed type"
+ "Overflow writing definite length of constructed type",
+ "HTTP Bad Request"
};
char *odr_errmsg(int n)
};
char *odr_errmsg(int n)
@@
-53,6
+54,19
@@
int odr_geterror(ODR o)
return o->error;
}
return o->error;
}
+int odr_geterrorx(ODR o, int *x)
+{
+ if (x)
+ *x = o->op->error_id;
+ return o->error;
+}
+
+void odr_seterror(ODR o, int error, int id)
+{
+ o->error = error;
+ o->op->error_id = id;
+}
+
void odr_setprint(ODR o, FILE *file)
{
o->print = file;
void odr_setprint(ODR o, FILE *file)
{
o->print = file;
@@
-84,7
+98,7
@@
ODR odr_createmem(int direction)
r->can_grow = 1;
r->mem = nmem_create();
r->enable_bias = 1;
r->can_grow = 1;
r->mem = nmem_create();
r->enable_bias = 1;
- r->op = xmalloc (sizeof(*r->op));
+ r->op = (struct Odr_private *) xmalloc (sizeof(*r->op));
r->op->odr_ber_tag.lclass = -1;
r->op->iconv_handle = 0;
odr_reset(r);
r->op->odr_ber_tag.lclass = -1;
r->op->iconv_handle = 0;
odr_reset(r);
@@
-94,7
+108,7
@@
ODR odr_createmem(int direction)
void odr_reset(ODR o)
{
void odr_reset(ODR o)
{
- o->error = ONONE;
+ odr_seterror(o, ONONE, 0);
o->bp = o->buf;
odr_seek(o, ODR_S_SET, 0);
o->top = 0;
o->bp = o->buf;
odr_seek(o, ODR_S_SET, 0);
o->top = 0;
@@
-141,3
+155,4
@@
char *odr_getbuf(ODR o, int *len, int *size)
*size = o->size;
return (char*) o->buf;
}
*size = o->size;
return (char*) o->buf;
}
+