X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fodr.h;h=2c88189a4748c89d3b54b840a845f792049a00bb;hb=a9a2a0427e8c387265ae6cccd16d97df6585e7ff;hp=0a0976fbf0427efa2106d451519b0fa82ad8af03;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git diff --git a/include/odr.h b/include/odr.h index 0a0976f..2c88189 100644 --- a/include/odr.h +++ b/include/odr.h @@ -24,7 +24,13 @@ * OF THIS SOFTWARE. * * $Log: odr.h,v $ - * Revision 1.12 1995-09-27 15:02:48 quinn + * Revision 1.14 1995-09-29 17:12:04 quinn + * Smallish + * + * Revision 1.13 1995/09/29 17:01:49 quinn + * More Windows work + * + * Revision 1.12 1995/09/27 15:02:48 quinn * Modified function heads & prototypes. * * Revision 1.11 1995/08/15 12:00:09 quinn @@ -190,7 +196,7 @@ typedef struct odr_constack unsigned char *base; /* starting point of data */ int base_offset; int len; /* length of data, if known, else -1 - (decoding only) */ + (decoding only) */ unsigned char *lenb; /* where to encode length */ int len_offset; int lenlen; /* length of length-field */ @@ -255,39 +261,39 @@ typedef struct odr_arm /* * Error control. */ -#define ONONE 0 -#define OMEMORY 1 -#define OSYSERR 2 -#define OSPACE 3 -#define OREQUIRED 4 -#define OUNEXPECTED 5 -#define OOTHER 6 -#define OPROTO 7 -#define ODATA 8 +#define ONONE 0 +#define OMEMORY 1 +#define OSYSERR 2 +#define OSPACE 3 +#define OREQUIRED 4 +#define OUNEXPECTED 5 +#define OOTHER 6 +#define OPROTO 7 +#define ODATA 8 #define OSTACK 9 #define OCONLEN 10 extern char *odr_errlist[]; -int MDF odr_geterror(ODR o); -void MDF odr_perror(ODR o, char *message); -void MDF odr_setprint(ODR o, FILE *file); -ODR MDF odr_createmem(int direction); -void MDF odr_reset(ODR o); -void MDF odr_destroy(ODR o); -void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow); -char MDF *odr_getbuf(ODR o, int *len, int *size); -void MDF *odr_malloc(ODR o, int size); -ODR_MEM MDF odr_extract_mem(ODR o); -void MDF odr_release_mem(ODR_MEM p); +int odr_geterror(ODR o); +void odr_perror(ODR o, char *message); +void odr_setprint(ODR o, FILE *file); +ODR odr_createmem(int direction); +void odr_reset(ODR o); +void odr_destroy(ODR o); +void odr_setbuf(ODR o, char *buf, int len, int can_grow); +char *odr_getbuf(ODR o, int *len, int *size); +void *odr_malloc(ODR o, int size); +ODR_MEM odr_extract_mem(ODR o); +void odr_release_mem(ODR_MEM p); #define odr_implicit(o, t, p, cl, tg, opt)\ - (odr_implicit_settag((o), cl, tg), t ((o), (p), opt) ) + (odr_implicit_settag((o), cl, tg), t ((o), (p), opt) ) #define odr_explicit(o, t, p, cl, tg, opt)\ - ((int) (odr_constructed_begin((o), (p), (cl), (tg)) ? \ - t ((o), (p), (opt)) &&\ - odr_constructed_end(o) : opt)) + ((int) (odr_constructed_begin((o), (p), (cl), (tg)) ? \ + t ((o), (p), (opt)) &&\ + odr_constructed_end(o) : opt)) #define ODR_MASK_ZERO(mask)\ ((void) (memset((mask)->bits, 0, ODR_BITMASK_SIZE),\ @@ -312,32 +318,32 @@ void MDF odr_release_mem(ODR_MEM p); #define odr_putc(o, c) \ ( \ ( \ - (o)->ecb.pos < (o)->ecb.size ? \ - ( \ - (o)->ecb.buf[(o)->ecb.pos++] = (c), \ - 0 \ - ) : \ - ( \ - odr_grow_block(&(o)->ecb, 1) == 0 ? \ - ( \ - (o)->ecb.buf[(o)->ecb.pos++] = (c), \ - 0 \ - ) : \ - ( \ - (o)->error = OSPACE, \ - -1 \ - ) \ - ) \ + (o)->ecb.pos < (o)->ecb.size ? \ + ( \ + (o)->ecb.buf[(o)->ecb.pos++] = (c), \ + 0 \ + ) : \ + ( \ + odr_grow_block(&(o)->ecb, 1) == 0 ? \ + ( \ + (o)->ecb.buf[(o)->ecb.pos++] = (c), \ + 0 \ + ) : \ + ( \ + (o)->error = OSPACE, \ + -1 \ + ) \ + ) \ ) == 0 ? \ ( \ - (o)->ecb.pos > (o)->ecb.top ? \ - ( \ - (o)->ecb.top = (o)->ecb.pos, \ - 0 \ - ) : \ - 0 \ + (o)->ecb.pos > (o)->ecb.top ? \ + ( \ + (o)->ecb.top = (o)->ecb.pos, \ + 0 \ + ) : \ + 0 \ ) : \ - -1 \ + -1 \ ) \ #define odr_tell(o) ((o)->ecb.pos)