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
Extra argument to p_query_rpn: protocol.
[yaz-moved-to-github.git]
/
odr
/
odr.c
diff --git
a/odr/odr.c
b/odr/odr.c
index
307283c
..
af2665d
100644
(file)
--- a/
odr/odr.c
+++ b/
odr/odr.c
@@
-4,7
+4,16
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
- * Revision 1.17 1995-09-29 17:01:50 quinn
+ * Revision 1.20 1995-11-08 17:41:32 quinn
+ * Smallish.
+ *
+ * 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
* More Windows work
*
* Revision 1.16 1995/09/27 15:02:57 quinn
@@
-62,7
+71,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
#include <odr.h>
Odr_null *ODR_NULLVAL = "NULL"; /* the presence of a null value */
#include <odr.h>
Odr_null *ODR_NULLVAL = "NULL"; /* the presence of a null value */
@@
-87,26
+96,26
@@
char *odr_errmsg(int n)
return odr_errlist[n];
}
return odr_errlist[n];
}
-void MDF odr_perror(ODR o, char *message)
+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;
{
struct odr *r;
- if (!(r = malloc(sizeof(*r))))
+ if (!(r = xmalloc(sizeof(*r))))
return 0;
r->direction = direction;
r->print = stderr;
return 0;
r->direction = direction;
r->print = stderr;
@@
-115,12
+124,12
@@
ODR MDF odr_createmem(int direction)
r->ecb.size = r->ecb.pos = r->ecb.top = 0;
r->ecb.can_grow = 1;
r->buflen = 0;
r->ecb.size = r->ecb.pos = r->ecb.top = 0;
r->ecb.can_grow = 1;
r->buflen = 0;
- r->mem = 0;
+ r->mem = nmem_create();
odr_reset(r);
return r;
}
odr_reset(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;
@@
-131,22
+140,21
@@
void MDF odr_reset(ODR o)
o->t_tag = -1;
o->indent = 0;
o->stackp = -1;
o->t_tag = -1;
o->indent = 0;
o->stackp = -1;
- odr_release_mem(o->mem);
- o->mem = 0;
+ nmem_reset(o->mem);
o->choice_bias = -1;
}
o->choice_bias = -1;
}
-void MDF odr_destroy(ODR o)
+void odr_destroy(ODR o)
{
{
- odr_release_mem(o->mem);
+ nmem_destroy(o->mem);
if (o->ecb.buf && o->ecb.can_grow)
if (o->ecb.buf && o->ecb.can_grow)
- free(o->ecb.buf);
+ xfree(o->ecb.buf);
if (o->print != stderr)
fclose(o->print);
if (o->print != stderr)
fclose(o->print);
- free(o);
+ xfree(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;
@@
-157,7
+165,7
@@
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)