Index: ossp-pkg/sa/sa.c RCS File: /v/ossp/cvs/ossp-pkg/sa/sa.c,v rcsdiff -q -kk '-r1.19' '-r1.20' -u '/v/ossp/cvs/ossp-pkg/sa/sa.c,v' 2>/dev/null --- sa.c 2001/10/09 18:34:12 1.19 +++ sa.c 2001/10/09 18:36:17 1.20 @@ -53,13 +53,6 @@ /* include own API header */ #include "sa.h" -/* socket address abstraction object */ -struct sa_addr_st { - int nFamily; /* the socket family (AF_XXX) */ - struct sockaddr *saBuf; /* the "struct sockaddr_xx" actually */ - socklen_t slBuf; /* the length of "struct sockaddr_xx" */ -}; - /* system call structure declaration macros */ #define SA_SC_DECLARE_0(rc_t, fn) \ struct { \ @@ -168,19 +161,26 @@ /* socket abstraction object */ struct sa_st { - sa_type_t eType; /* socket type (stream or datagram) */ - int fdSocket; /* socket file descriptor */ - struct timeval tvTimeout[6];/* timeout values (sec, usec) */ - int nReadLen; /* read buffer current length */ - int nReadSize; /* read buffer current size */ - char *cpReadBuf; /* read buffer memory chunk */ - int nWriteLen; /* write buffer current length */ - int nWriteSize; /* write buffer current size */ - char *cpWriteBuf; /* write buffer memory chunk */ - char szError[256]; - char szErrorInfo[128]; - sa_rc_t rvErrorInfo; - sa_syscall_tab_t scSysCall; + sa_type_t eType; /* socket type (stream or datagram) */ + int fdSocket; /* socket file descriptor */ + struct timeval tvTimeout[6]; /* timeout values (sec, usec) */ + int nReadLen; /* read buffer current length */ + int nReadSize; /* read buffer current size */ + char *cpReadBuf; /* read buffer memory chunk */ + int nWriteLen; /* write buffer current length */ + int nWriteSize; /* write buffer current size */ + char *cpWriteBuf; /* write buffer memory chunk */ + char szError[256]; /* error temporary buffer */ + char szErrorInfo[128]; /* error additional information text */ + sa_rc_t rvErrorInfo; /* error additional information code */ + sa_syscall_tab_t scSysCall; /* table of system calls */ +}; + +/* socket address abstraction object */ +struct sa_addr_st { + int nFamily; /* the socket family (AF_XXX) */ + struct sockaddr *saBuf; /* the "struct sockaddr_xx" actually */ + socklen_t slBuf; /* the length of "struct sockaddr_xx" */ }; /* boolean values */