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
Merge branch 'master' into sru_2_0
[yaz-moved-to-github.git]
/
src
/
ber_tag.c
diff --git
a/src/ber_tag.c
b/src/ber_tag.c
index
f7c0686
..
f005078
100644
(file)
--- a/
src/ber_tag.c
+++ b/
src/ber_tag.c
@@
-1,11
+1,9
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: ber_tag.c,v 1.6 2005-08-11 14:21:55 adam Exp $
*/
*/
-/**
+/**
* \file ber_tag.c
* \brief Implements BER tags encoding and decoding
*
* \file ber_tag.c
* \brief Implements BER tags encoding and decoding
*
@@
-42,7
+40,7
@@
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
if (o->direction == ODR_DECODE)
*pp = 0;
if (o->direction == ODR_DECODE)
*pp = 0;
- o->t_class = -1;
+ o->op->t_class = -1;
if (ODR_STACK_EMPTY(o))
{
odr_seek(o, ODR_S_SET, 0);
if (ODR_STACK_EMPTY(o))
{
odr_seek(o, ODR_S_SET, 0);
@@
-159,14
+157,15
@@
int ber_enctag(ODR o, int zclass, int tag, int constructed)
}
}
}
}
-/**
+/**
* \brief Decodes BER identifier octets.
*
* Returns number of bytes read or -1 for error.
*/
* \brief Decodes BER identifier octets.
*
* Returns number of bytes read or -1 for error.
*/
-int ber_dectag(const unsigned char *b, int *zclass, int *tag,
+int ber_dectag(const char *cp, int *zclass, int *tag,
int *constructed, int max)
{
int *constructed, int max)
{
+ const unsigned char *b = (const unsigned char *) cp;
int l = 1;
if (l > max)
int l = 1;
if (l > max)
@@
-190,6
+189,7
@@
int ber_dectag(const unsigned char *b, int *zclass, int *tag,
/*
* 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