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
Use ZOOM_API for new function ZOOM_get_event_str
[yaz-moved-to-github.git]
/
src
/
ber_tag.c
diff --git
a/src/ber_tag.c
b/src/ber_tag.c
index
64908d7
..
59c324a
100644
(file)
--- a/
src/ber_tag.c
+++ b/
src/ber_tag.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: ber_tag.c,v 1.5 2005-06-25 15:46:03 adam Exp $
*/
/**
*/
/**
@@
-19,15
+17,19
@@
#include <stdio.h>
#include "odr-priv.h"
#include <stdio.h>
#include "odr-priv.h"
-/* ber_tag
+/**
+ * \brief Encode/decode BER tags
+ *
* On encoding:
* On encoding:
+ * \verbatim
* if p: write tag. return 1 (success) or -1 (error).
* if !p: return 0.
* if p: write tag. return 1 (success) or -1 (error).
* if !p: return 0.
+ * \endverbatim
* On decoding:
* On decoding:
+ * \verbatim
* if tag && zclass match up, advance pointer and return 1. set cons.
* else leave pointer unchanged. Return 0.
* if tag && zclass match up, advance pointer and return 1. set cons.
* else leave pointer unchanged. Return 0.
- *
- * Should perhaps be odr_tag?
+ * \endverbatim
*/
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
const char *name)
*/
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
const char *name)
@@
-38,8
+40,8
@@
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;
- if (o->op->stackp < 0)
+ o->op->t_class = -1;
+ if (ODR_STACK_EMPTY(o))
{
odr_seek(o, ODR_S_SET, 0);
o->top = 0;
{
odr_seek(o, ODR_S_SET, 0);
o->top = 0;
@@
-60,14
+62,9
@@
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
}
if ((rd = ber_enctag(o, zclass, tag, *constructed)) < 0)
return -1;
}
if ((rd = ber_enctag(o, zclass, tag, *constructed)) < 0)
return -1;
-#ifdef ODR_DEBUG
- fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", zclass, tag,
- *constructed, o->op->stackp);
-#endif
return 1;
return 1;
-
case ODR_DECODE:
case ODR_DECODE:
- if (o->op->stackp > -1 && !odr_constructed_more(o))
+ if (ODR_STACK_NOT_EMPTY(o) && !odr_constructed_more(o))
{
if (!opt)
{
{
if (!opt)
{
@@
-87,12
+84,6
@@
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
odr_setelement(o, name);
return 0;
}
odr_setelement(o, name);
return 0;
}
-#ifdef ODR_DEBUG
- fprintf(stderr,
- "\n[class=%d,tag=%d,cons=%d,stackp=%d]",
- odr_ber_tag->lclass, odr_ber_tag->ltag,
- odr_ber_tag->lcons, o->op->stackp);
-#endif
}
if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
{
}
if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
{
@@
-124,9
+115,10
@@
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
}
}
}
}
-/* ber_enctag
- * BER-encode a zclass/tag/constructed package (identifier octets). Return
- * number of bytes encoded, or -1 if out of bounds.
+/**
+ * \brief BER-encode a zclass/tag/constructed package (identifier octets).
+ *
+ * Return number of bytes encoded, or -1 if out of bounds.
*/
int ber_enctag(ODR o, int zclass, int tag, int constructed)
{
*/
int ber_enctag(ODR o, int zclass, int tag, int constructed)
{
@@
-165,8
+157,10
@@
int ber_enctag(ODR o, int zclass, int tag, int constructed)
}
}
}
}
-/* ber_dectag
- * Decode BER identifier octets. Return 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 *constructed, int max)
*/
int ber_dectag(const unsigned char *b, int *zclass, int *tag,
int *constructed, int max)