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
Remove SSL via OpenSSL support YAZ-732
[yaz-moved-to-github.git]
/
src
/
odr_tag.c
diff --git
a/src/odr_tag.c
b/src/odr_tag.c
index
3fe167b
..
f4bcd3d
100644
(file)
--- a/
src/odr_tag.c
+++ b/
src/odr_tag.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, 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_tag.c,v 1.6 2007-01-03 08:42:15 adam Exp $
*/
/**
* \file odr_tag.c
*/
/**
* \file odr_tag.c
@@
-23,7
+21,7
@@
int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
}
if (ODR_STACK_NOT_EMPTY(o) && !odr_constructed_more(o))
return 0;
}
if (ODR_STACK_NOT_EMPTY(o) && !odr_constructed_more(o))
return 0;
- if (ber_dectag(o->bp, zclass, tag, cons, odr_max(o)) <= 0)
+ if (ber_dectag(o->op->bp, zclass, tag, cons, odr_max(o)) <= 0)
{
odr_seterror(o, OREQUIRED, 49);
return 0;
{
odr_seterror(o, OREQUIRED, 49);
return 0;
@@
-35,10
+33,10
@@
int odr_implicit_settag(ODR o, int zclass, int tag)
{
if (o->error)
return 0;
{
if (o->error)
return 0;
- if (o->t_class < 0)
+ if (o->op->t_class < 0)
{
{
- o->t_class = zclass;
- o->t_tag = tag;
+ o->op->t_class = zclass;
+ o->op->t_tag = tag;
}
return 1;
}
}
return 1;
}
@@
-53,7
+51,7
@@
int odr_initmember(ODR o, void *p, int size)
*pp = (char *)odr_malloc(o, size);
else if (!*pp)
{
*pp = (char *)odr_malloc(o, size);
else if (!*pp)
{
- o->t_class = -1;
+ o->op->t_class = -1;
return 0;
}
return 1;
return 0;
}
return 1;
@@
-61,6
+59,7
@@
int odr_initmember(ODR o, void *p, int size)
/*
* Local variables:
* c-basic-offset: 4
/*
* 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