Mercurial > hg > nnchat
changeset 90:1e0bf7b4fd41
Move socket error handling functions to libnnchat.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 06 May 2009 23:55:21 +0300 |
| parents | c2d916b340bf |
| children | acfc4b4bc180 |
| files | libnnchat.c libnnchat.h nnchat.c |
| diffstat | 3 files changed, 38 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/libnnchat.c Wed May 06 05:05:02 2009 +0300 +++ b/libnnchat.c Wed May 06 23:55:21 2009 +0300 @@ -20,6 +20,38 @@ const int numHTMLEntities = (sizeof(HTMLEntities) / sizeof(HTMLEntities[0])); +#ifdef __WIN32 +const char *hstrerror(int err) +{ + static char buf[64]; + snprintf(buf, sizeof(buf), "Error #%d", err); + return buf; +} + +int getSocketErrno(void) +{ + return WSAGetLastError(); +} + +const char *getSocketErrStr(int err) +{ + static char buf[64]; + snprintf(buf, sizeof(buf), "Error #%d", err); + return buf; +} +#else +int getSocketErrno(void) +{ + return errno; +} + +const char *getSocketErrStr(int err) +{ + return strerror(err); +} +#endif + + int openConnection(struct in_addr *addr, const int port) { struct sockaddr_in tmpAddr;
--- a/libnnchat.h Wed May 06 05:05:02 2009 +0300 +++ b/libnnchat.h Wed May 06 23:55:21 2009 +0300 @@ -40,6 +40,12 @@ } nn_user_t; +#ifdef __WIN32 +const char *hstrerror(int err); +#endif +int getSocketErrno(void); +const char *getSocketErrStr(int err); + int openConnection(struct in_addr *addr, const int port); void closeConnection(const int sock); BOOL sendToSocket(const int sock, char *buf, const size_t bufLen);
--- a/nnchat.c Wed May 06 05:05:02 2009 +0300 +++ b/nnchat.c Wed May 06 23:55:21 2009 +0300 @@ -8,7 +8,6 @@ #include "th_args.h" #include <string.h> #include <errno.h> -#include <time.h> #ifdef __WIN32 #define usleep(t) Sleep((t) / 1000) /* Undefine because both windows.h and curses.h #define it */ @@ -150,36 +149,6 @@ return TRUE; } -#ifdef __WIN32 -const char *hstrerror(int err) -{ - static char buf[64]; - snprintf(buf, sizeof(buf), "Error #%d", err); - return buf; -} - -int getSocketErrno(void) -{ - return WSAGetLastError(); -} - -const char *getSocketErrStr(int err) -{ - static char buf[64]; - snprintf(buf, sizeof(buf), "Error #%d", err); - return buf; -} -#else -int getSocketErrno(void) -{ - return errno; -} - -const char *getSocketErrStr(int err) -{ - return strerror(err); -} -#endif void updateStatus(BOOL insertMode) {