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
Make data1 to EXPLAIN ignore local tags in root.
[yaz-moved-to-github.git]
/
odr
/
odr_oct.c
diff --git
a/odr/odr_oct.c
b/odr/odr_oct.c
index
d5d2dab
..
b9c572d
100644
(file)
--- a/
odr/odr_oct.c
+++ b/
odr/odr_oct.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
- * Revision 1.10 1995-09-27 15:02:59 quinn
+ * 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
+ * Smallish
+ *
+ * Revision 1.10 1995/09/27 15:02:59 quinn
* Modified function heads & prototypes.
*
* Revision 1.9 1995/05/16 08:50:56 quinn
* Modified function heads & prototypes.
*
* Revision 1.9 1995/05/16 08:50:56 quinn
@@
-42,7
+48,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 MDF odr_octetstring(ODR o, Odr_oct **p, int opt)
+int odr_octetstring(ODR o, Odr_oct **p, int opt)
{
int res, cons = 0;
{
int res, cons = 0;
@@
-64,7
+70,7
@@
int MDF odr_octetstring(ODR o, Odr_oct **p, int opt)
}
if (o->direction == ODR_DECODE)
{
}
if (o->direction == ODR_DECODE)
{
- *p = odr_malloc(o, sizeof(Odr_oct));
+ *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
@@
-78,7
+84,7
@@
int MDF odr_octetstring(ODR o, Odr_oct **p, int opt)
/*
* Friendlier interface to octetstring.
*/
/*
* Friendlier interface to octetstring.
*/
-int MDF odr_cstring(ODR o, char **p, int opt)
+int odr_cstring(ODR o, char **p, int opt)
{
int cons = 0, res;
Odr_oct *t;
{
int cons = 0, res;
Odr_oct *t;
@@
-99,7
+105,7
@@
int MDF odr_cstring(ODR o, char **p, int opt)
fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
return 1;
}
fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
return 1;
}
- t = odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
+ t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
if (o->direction == ODR_ENCODE)
{
t->buf = (unsigned char *) *p;
if (o->direction == ODR_ENCODE)
{
t->buf = (unsigned char *) *p;