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
Update news
[yaz-moved-to-github.git]
/
src
/
odr_enum.c
diff --git
a/src/odr_enum.c
b/src/odr_enum.c
index
1b3f81f
..
caf83f3
100644
(file)
--- a/
src/odr_enum.c
+++ b/
src/odr_enum.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: odr_enum.c,v 1.5 2005-06-25 15:46:04 adam Exp $
*/
/**
* \file odr_enum.c
*/
/**
* \file odr_enum.c
@@
-18,18
+16,19
@@
* Top level enum en/decoder.
* Returns 1 on success, 0 on error.
*/
* Top level enum en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_enum(ODR o, int **p, int opt, const char *name)
+int odr_enum(ODR o, Odr_int **p, int opt, const char *name)
{
int res, cons = 0;
if (o->error)
return 0;
{
int res, cons = 0;
if (o->error)
return 0;
- if (o->t_class < 0)
+ if (o->op->t_class < 0)
{
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_ENUM;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_ENUM;
}
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 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 0;
if (!res)
return odr_missing(o, opt, name);
@@
-45,12
+44,13
@@
int odr_enum(ODR o, int **p, int opt, const char *name)
return 0;
}
if (o->direction == ODR_DECODE)
return 0;
}
if (o->direction == ODR_DECODE)
- *p = (int *)odr_malloc(o, sizeof(int));
+ *p = (Odr_int *)odr_malloc(o, sizeof(**p));
return ber_integer(o, *p);
}
/*
* Local variables:
* c-basic-offset: 4
return ber_integer(o, *p);
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab