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
Fixed bug in match_triple. Thanks to Franck Falcoz <franck@dtv.dk>.
[yaz-moved-to-github.git]
/
odr
/
odr_oct.c
diff --git
a/odr/odr_oct.c
b/odr/odr_oct.c
index
b9c572d
..
5598e4c
100644
(file)
--- a/
odr/odr_oct.c
+++ b/
odr/odr_oct.c
@@
-1,10
+1,14
@@
/*
/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
- * Revision 1.12 1998-02-11 11:53:34 adam
+ * Revision 1.13 1999-04-20 09:56:48 adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.12 1998/02/11 11:53:34 adam
* Changed code so that it compiles as C++.
*
* Revision 1.11 1995/09/29 17:12:25 quinn
* Changed code so that it compiles as C++.
*
* Revision 1.11 1995/09/29 17:12:25 quinn
@@
-48,7
+52,7
@@
* Top level octet string en/decoder.
* Returns 1 on success, 0 on error.
*/
* Top level octet string en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_octetstring(ODR o, Odr_oct **p, int opt)
+int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
{
int res, cons = 0;
{
int res, cons = 0;
@@
-65,7
+69,8
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt)
return opt;
if (o->direction == ODR_PRINT)
{
return opt;
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "%sOCTETSTRING(len=%d)\n", odr_indent(o), (*p)->len);
+ odr_prname(o, name);
+ fprintf(o->print, "OCTETSTRING(len=%d)\n", (*p)->len);
return 1;
}
if (o->direction == ODR_DECODE)
return 1;
}
if (o->direction == ODR_DECODE)
@@
-84,7
+89,7
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt)
/*
* Friendlier interface to octetstring.
*/
/*
* Friendlier interface to octetstring.
*/
-int odr_cstring(ODR o, char **p, int opt)
+int odr_cstring(ODR o, char **p, int opt, const char *name)
{
int cons = 0, res;
Odr_oct *t;
{
int cons = 0, res;
Odr_oct *t;
@@
-102,7
+107,8
@@
int odr_cstring(ODR o, char **p, int opt)
return opt;
if (o->direction == ODR_PRINT)
{
return opt;
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
+ odr_prname(o, name);
+ fprintf(o->print, "'%s'\n", *p);
return 1;
}
t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
return 1;
}
t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */