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
Towards 2.0.2
[yaz-moved-to-github.git]
/
odr
/
odr_int.c
diff --git
a/odr/odr_int.c
b/odr/odr_int.c
index
df4655e
..
f5a3b33
100644
(file)
--- a/
odr/odr_int.c
+++ b/
odr/odr_int.c
@@
-1,44
+1,47
@@
/*
/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: odr_int.c,v $
- * Revision 1.1 1995-02-02 16:21:53 quinn
- * First kick.
- *
+ * $Id: odr_int.c,v 1.18 2003-03-11 11:03:31 adam Exp $
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
+#include "odr-priv.h"
/*
* Top level integer en/decoder.
* Returns 1 on success, 0 on error.
*/
/*
* Top level integer en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_integer(ODR o, int **p, int opt)
+int odr_integer(ODR o, int **p, int opt, const char *name)
{
int res, cons = 0;
{
int res, cons = 0;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
if (o->t_class < 0)
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_INTEGER;
+ o->t_class = ODR_UNIVERSAL;
+ o->t_tag = ODR_INTEGER;
}
}
- if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
- return 0;
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
+ return 0;
if (!res)
if (!res)
- {
- *p = 0;
- return opt;
- }
+ return opt;
if (o->direction == ODR_PRINT)
{
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "%d\n", **p);
- return 1;
+ odr_prname(o, name);
+ fprintf(o->print, "%d\n", **p);
+ return 1;
}
if (cons)
}
if (cons)
- return 0;
+ {
+ odr_seterror(o, OPROTO, 1);
+ return 0;
+ }
if (o->direction == ODR_DECODE)
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(int));
+ *p = (int *)odr_malloc(o, sizeof(int));
return ber_integer(o, *p);
}
return ber_integer(o, *p);
}