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
Expanded tabs in all source files. Added vim/emacs local variables
[yaz-moved-to-github.git]
/
src
/
ber_tag.c
diff --git
a/src/ber_tag.c
b/src/ber_tag.c
index
19c412f
..
64908d7
100644
(file)
--- a/
src/ber_tag.c
+++ b/
src/ber_tag.c
@@
-1,9
+1,16
@@
/*
/*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
*
- * $Id: ber_tag.c,v 1.1 2003-10-27 12:21:30 adam Exp $
+ * $Id: ber_tag.c,v 1.5 2005-06-25 15:46:03 adam Exp $
+ */
+
+/**
+ * \file ber_tag.c
+ * \brief Implements BER tags encoding and decoding
+ *
+ * This source file implements BER encoding and decoding of
+ * the tags.
*/
#if HAVE_CONFIG_H
#include <config.h>
*/
#if HAVE_CONFIG_H
#include <config.h>
@@
-14,8
+21,8
@@
/* ber_tag
* On encoding:
/* ber_tag
* On encoding:
- * 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.
* On decoding:
* if tag && zclass match up, advance pointer and return 1. set cons.
* else leave pointer unchanged. Return 0.
* On decoding:
* if tag && zclass match up, advance pointer and return 1. set cons.
* else leave pointer unchanged. Return 0.
@@
-30,13
+37,13
@@
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
char **pp = (char **)p;
if (o->direction == ODR_DECODE)
char **pp = (char **)p;
if (o->direction == ODR_DECODE)
- *pp = 0;
+ *pp = 0;
o->t_class = -1;
if (o->op->stackp < 0)
{
o->t_class = -1;
if (o->op->stackp < 0)
{
- odr_seek(o, ODR_S_SET, 0);
+ odr_seek(o, ODR_S_SET, 0);
o->top = 0;
o->top = 0;
- o->bp = o->buf;
+ o->bp = o->buf;
odr_ber_tag->lclass = -1;
}
switch (o->direction)
odr_ber_tag->lclass = -1;
}
switch (o->direction)
@@
-55,7
+62,7
@@
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
return -1;
#ifdef ODR_DEBUG
fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", zclass, tag,
return -1;
#ifdef ODR_DEBUG
fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", zclass, tag,
- *constructed, o->stackp);
+ *constructed, o->op->stackp);
#endif
return 1;
#endif
return 1;
@@
-84,7
+91,7
@@
int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt,
fprintf(stderr,
"\n[class=%d,tag=%d,cons=%d,stackp=%d]",
odr_ber_tag->lclass, odr_ber_tag->ltag,
fprintf(stderr,
"\n[class=%d,tag=%d,cons=%d,stackp=%d]",
odr_ber_tag->lclass, odr_ber_tag->ltag,
- odr_ber_tag->lcons, o->stackp);
+ odr_ber_tag->lcons, o->op->stackp);
#endif
}
if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
#endif
}
if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag)
@@
-130,31
+137,31
@@
int ber_enctag(ODR o, int zclass, int tag, int constructed)
b |= (cons << 5) & 0X20;
if (tag <= 30)
{
b |= (cons << 5) & 0X20;
if (tag <= 30)
{
- b |= tag & 0X1F;
- if (odr_putc(o, b) < 0)
- return -1;
- return 1;
+ b |= tag & 0X1F;
+ if (odr_putc(o, b) < 0)
+ return -1;
+ return 1;
}
else
{
}
else
{
- b |= 0X1F;
- if (odr_putc(o, b) < 0)
- return -1;
- do
- {
- octs[n++] = tag & 0X7F;
- tag >>= 7;
- }
- while (tag);
- while (n--)
- {
- unsigned char oo;
+ b |= 0X1F;
+ if (odr_putc(o, b) < 0)
+ return -1;
+ do
+ {
+ octs[n++] = tag & 0X7F;
+ tag >>= 7;
+ }
+ while (tag);
+ while (n--)
+ {
+ unsigned char oo;
- oo = octs[n] | ((n > 0) << 7);
- if (odr_putc(o, oo) < 0)
- return -1;
- }
- return 0;
+ oo = octs[n] | ((n > 0) << 7);
+ if (odr_putc(o, oo) < 0)
+ return -1;
+ }
+ return 0;
}
}
}
}
@@
-172,15
+179,23
@@
int ber_dectag(const unsigned char *b, int *zclass, int *tag,
*zclass = *b >> 6;
*constructed = (*b >> 5) & 0X01;
if ((*tag = *b & 0x1F) <= 30)
*zclass = *b >> 6;
*constructed = (*b >> 5) & 0X01;
if ((*tag = *b & 0x1F) <= 30)
- return 1;
+ return 1;
*tag = 0;
do
{
if (l >= max)
return -1;
*tag = 0;
do
{
if (l >= max)
return -1;
- *tag <<= 7;
- *tag |= b[l] & 0X7F;
+ *tag <<= 7;
+ *tag |= b[l] & 0X7F;
}
while (b[l++] & 0X80);
return l;
}
}
while (b[l++] & 0X80);
return l;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+