X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oct.c;h=b9c572d695b3c40556a302cc663ae7ded9aee1b5;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=fe2ffc5dd736381e63233e3f1e2bb9287d6059f3;hpb=892f7f56860a1ee8e8d816eeaec0387c54c1a0a7;p=yaz-moved-to-github.git diff --git a/odr/odr_oct.c b/odr/odr_oct.c index fe2ffc5..b9c572d 100644 --- a/odr/odr_oct.c +++ b/odr/odr_oct.c @@ -1,10 +1,22 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_oct.c,v $ - * Revision 1.8 1995-03-17 10:17:54 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 + * License, documentation, and memory fixes + * + * Revision 1.8 1995/03/17 10:17:54 quinn * Added memory management. * * Revision 1.7 1995/03/08 12:12:27 quinn @@ -58,7 +70,7 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt) } 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; @@ -93,7 +105,7 @@ int odr_cstring(ODR o, char **p, int opt) 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;