X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fcomstack.h;h=e14b8eaf537858be38903464bfcb16b0eda4a90f;hb=a9a2a0427e8c387265ae6cccd16d97df6585e7ff;hp=42c8b03a560d6b9fa99a872a2f8ef404f0873700;hpb=d4081206ab9bd0ed0c97c032d264ad1e1d4a051e;p=yaz-moved-to-github.git diff --git a/include/comstack.h b/include/comstack.h index 42c8b03..e14b8ea 100644 --- a/include/comstack.h +++ b/include/comstack.h @@ -24,7 +24,25 @@ * OF THIS SOFTWARE. * * $Log: comstack.h,v $ - * Revision 1.5 1995-05-29 08:11:31 quinn + * Revision 1.11 1995-09-29 17:12:01 quinn + * Smallish + * + * Revision 1.10 1995/09/29 17:01:48 quinn + * More Windows work + * + * Revision 1.9 1995/09/28 10:12:36 quinn + * Windows-support changes + * + * Revision 1.8 1995/09/27 15:02:46 quinn + * Modified function heads & prototypes. + * + * Revision 1.7 1995/06/19 12:38:24 quinn + * Reorganized include-files. Added small features. + * + * Revision 1.6 1995/05/30 10:54:51 quinn + * Added some backwards compatibility to the comstack (CS_SR->PROTO_SR) + * + * Revision 1.5 1995/05/29 08:11:31 quinn * Moved oid from odr/asn to util. * * Revision 1.4 1995/05/16 08:50:29 quinn @@ -81,10 +99,11 @@ #ifndef COMSTACK_H #define COMSTACK_H +#include #include #include -#define COMSTACK_DEFAULT_TIMEOUT -1 +#define COMSTACK_DEFAULT_TIMEOUT -1 /* not used yet */ struct comstack; typedef struct comstack *COMSTACK; @@ -93,10 +112,10 @@ typedef COMSTACK (*CS_TYPE)(int blocking, int protocol); struct comstack { CS_TYPE type; - int errno; /* current error code of this stack */ + int cerrno; /* current error code of this stack */ char *stackerr;/* current lower-layer error string, or null if none */ int iofile; /* UNIX file descriptor for iochannel */ - int timeout; /* how long to wait for trailing blocks */ + int timeout; /* how long to wait for trailing blocks (ignored for now) */ void *private; /* state info for lower stack */ int more; /* connection has extra data in buffer */ int state; /* current state */ @@ -142,10 +161,11 @@ struct comstack #define cs_fileno(handle) ((handle)->iofile) #define cs_stackerr(handle) ((handle)->stackerr) #define cs_getstate(handle) ((handle)->getstate) -#define cs_errno(handle) ((handle)->errno) +#define cs_errno(handle) ((handle)->cerrno) #define cs_getproto(handle) ((handle)->protocol) const char *cs_strerror(COMSTACK h); +const char *cs_errmsg(int n); /* * error management. @@ -159,4 +179,8 @@ const char *cs_strerror(COMSTACK h); extern char *cs_errlist[]; +/* backwards compatibility */ +#define CS_SR PROTO_SR +#define CS_Z3950 PROTO_Z3950 + #endif