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
Stupid bug in odr_malloc
[yaz-moved-to-github.git]
/
odr
/
odr.c
diff --git
a/odr/odr.c
b/odr/odr.c
index
732f258
..
cc94ef8
100644
(file)
--- a/
odr/odr.c
+++ b/
odr/odr.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
- * Revision 1.16 1995-09-27 15:02:57 quinn
+ * 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
* Modified function heads & prototypes.
*
* Revision 1.15 1995/08/15 12:00:22 quinn
@@
-79,27
+85,32
@@
char *odr_errlist[] =
"Length of constructed type different from sum of members"
};
"Length of constructed type different from sum of members"
};
-void MDF odr_perror(ODR o, char *message)
+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]);
}
{
fprintf(stderr, "%s: %s\n", message, odr_errlist[o->error]);
}
-int MDF odr_geterror(ODR o)
+int odr_geterror(ODR o)
{
return o->error;
}
{
return o->error;
}
-void MDF odr_setprint(ODR o, FILE *file)
+void odr_setprint(ODR o, FILE *file)
{
o->print = file;
}
{
o->print = file;
}
-ODR MDF odr_createmem(int direction)
+ODR odr_createmem(int direction)
{
struct odr *r;
if (!(r = malloc(sizeof(*r))))
{
struct odr *r;
if (!(r = malloc(sizeof(*r))))
- return 0;
+ return 0;
r->direction = direction;
r->print = stderr;
r->buf = 0;
r->direction = direction;
r->print = stderr;
r->buf = 0;
@@
-112,7
+123,7
@@
ODR MDF odr_createmem(int direction)
return r;
}
return r;
}
-void MDF odr_reset(ODR o)
+void odr_reset(ODR o)
{
o->error = ONONE;
o->bp = o->buf;
{
o->error = ONONE;
o->bp = o->buf;
@@
-128,17
+139,17
@@
void MDF odr_reset(ODR o)
o->choice_bias = -1;
}
o->choice_bias = -1;
}
-void MDF odr_destroy(ODR o)
+void odr_destroy(ODR o)
{
odr_release_mem(o->mem);
if (o->ecb.buf && o->ecb.can_grow)
{
odr_release_mem(o->mem);
if (o->ecb.buf && o->ecb.can_grow)
- free(o->ecb.buf);
+ free(o->ecb.buf);
if (o->print != stderr)
if (o->print != stderr)
- fclose(o->print);
+ fclose(o->print);
free(o);
}
free(o);
}
-void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow)
+void odr_setbuf(ODR o, char *buf, int len, int can_grow)
{
o->buf = o->bp = (unsigned char *) buf;
o->buflen = o->left = len;
{
o->buf = o->bp = (unsigned char *) buf;
o->buflen = o->left = len;
@@
-149,10
+160,10
@@
void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow)
o->ecb.size = len;
}
o->ecb.size = len;
}
-char MDF *odr_getbuf(ODR o, int *len, int *size)
+char *odr_getbuf(ODR o, int *len, int *size)
{
*len = o->ecb.top;
if (size)
{
*len = o->ecb.top;
if (size)
- *size = o->ecb.size;
+ *size = o->ecb.size;
return (char*) o->ecb.buf;
}
return (char*) o->ecb.buf;
}