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
yaz-iconv: fix typos
[yaz-moved-to-github.git]
/
src
/
odr_bool.c
diff --git
a/src/odr_bool.c
b/src/odr_bool.c
index
d1582f5
..
cb90829
100644
(file)
--- a/
src/odr_bool.c
+++ b/
src/odr_bool.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: odr_bool.c,v 1.4 2005-01-15 19:47:14 adam Exp $
*/
/**
*/
/**
@@
-20,30
+18,40
@@
* Top level boolean en/decoder.
* Returns 1 on success, 0 on error.
*/
* Top level boolean en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_bool(ODR o, int **p, int opt, const char *name)
+int odr_bool(ODR o, Odr_bool **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_BOOLEAN;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_BOOLEAN;
}
}
- 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 ? "TRUE" : "FALSE"));
- return 1;
+ odr_prname(o, name);
+ odr_printf(o, "%s\n", (**p ? "TRUE" : "FALSE"));
+ return 1;
}
if (cons)
}
if (cons)
- return 0;
+ return 0;
if (o->direction == ODR_DECODE)
if (o->direction == ODR_DECODE)
- *p = (int *)odr_malloc(o, sizeof(int));
+ *p = (int *)odr_malloc(o, sizeof(int));
return ber_boolean(o, *p);
}
return ber_boolean(o, *p);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+