X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr.c;h=b44078a004b0fc181880de367c84886d2c4fcf98;hp=d007f1b0d9221189a1fe506b2d0484e6fccf0cfb;hb=2004bbd9b3bbce5eb8ecc49520255b3d0bf578b9;hpb=72592d242326dea9e05cae90d50348a2da0c0948 diff --git a/odr/odr.c b/odr/odr.c index d007f1b..b44078a 100644 --- a/odr/odr.c +++ b/odr/odr.c @@ -4,7 +4,19 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr.c,v $ - * Revision 1.15 1995-08-15 12:00:22 quinn + * Revision 1.19 1995-11-01 13:54:41 quinn + * Minor adjustments + * + * Revision 1.18 1995/09/29 17:12:22 quinn + * Smallish + * + * Revision 1.17 1995/09/29 17:01:50 quinn + * More Windows work + * + * Revision 1.16 1995/09/27 15:02:57 quinn + * Modified function heads & prototypes. + * + * Revision 1.15 1995/08/15 12:00:22 quinn * Updated External * * Revision 1.14 1995/06/19 12:38:46 quinn @@ -56,7 +68,7 @@ #include #include -#include +#include #include Odr_null *ODR_NULLVAL = "NULL"; /* the presence of a null value */ @@ -76,6 +88,11 @@ char *odr_errlist[] = "Length of constructed type different from sum of members" }; +char *odr_errmsg(int n) +{ + return odr_errlist[n]; +} + void odr_perror(ODR o, char *message) { fprintf(stderr, "%s: %s\n", message, odr_errlist[o->error]); @@ -95,8 +112,8 @@ ODR odr_createmem(int direction) { struct odr *r; - if (!(r = malloc(sizeof(*r)))) - return 0; + if (!(r = xmalloc(sizeof(*r)))) + return 0; r->direction = direction; r->print = stderr; r->buf = 0; @@ -129,10 +146,10 @@ void odr_destroy(ODR o) { odr_release_mem(o->mem); if (o->ecb.buf && o->ecb.can_grow) - free(o->ecb.buf); + xfree(o->ecb.buf); if (o->print != stderr) - fclose(o->print); - free(o); + fclose(o->print); + xfree(o); } void odr_setbuf(ODR o, char *buf, int len, int can_grow) @@ -150,6 +167,6 @@ char *odr_getbuf(ODR o, int *len, int *size) { *len = o->ecb.top; if (size) - *size = o->ecb.size; + *size = o->ecb.size; return (char*) o->ecb.buf; }