# HG changeset patch # User Matti Hamalainen # Date 1241643321 -10800 # Node ID 1e0bf7b4fd4113798af7f3936d66bcd5cc9de72d # Parent c2d916b340bf7bda58803677c4e0761c1123b286 Move socket error handling functions to libnnchat. diff -r c2d916b340bf -r 1e0bf7b4fd41 libnnchat.c --- 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; diff -r c2d916b340bf -r 1e0bf7b4fd41 libnnchat.h --- 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); diff -r c2d916b340bf -r 1e0bf7b4fd41 nnchat.c --- 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 #include -#include #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) {