diff options
author | Yang Tse <yangsita@gmail.com> | 2007-02-16 16:01:19 +0000 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2007-02-16 16:01:19 +0000 |
commit | 4894ce16fc7af89d876e2f70db4dded7e1663198 (patch) | |
tree | 87d862afccc642c48f55d7549160859401b3face /tests/libtest/lib537.c | |
parent | aa4435c23b008450124d8c015e896d1002cb93ca (diff) |
use macros ERRNO, SET_ERRNO(), SOCKERRNO and SET_SOCKERRNO() for errno handling
Diffstat (limited to 'tests/libtest/lib537.c')
-rw-r--r-- | tests/libtest/lib537.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index fb2482083..85635043b 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -48,20 +48,6 @@ static int *fd = NULL; static struct rlimit num_open; static char msgbuff[256]; -/* - * our_errno() returns the NOT *socket-related* errno (or equivalent) - * on this platform to hide platform specific for the calling function. - */ - -static int our_errno(void) -{ -#ifdef WIN32 - return (int)GetLastError(); -#else - return errno; -#endif -} - static void store_errmsg(const char *msg, int err) { if (!err) @@ -104,7 +90,7 @@ static int rlimit(int keep_open) /* get initial open file limits */ if (getrlimit(RLIMIT_NOFILE, &rl) != 0) { - store_errmsg("getrlimit() failed", our_errno()); + store_errmsg("getrlimit() failed", ERRNO); fprintf(stderr, "%s\n", msgbuff); return -1; } @@ -141,7 +127,7 @@ static int rlimit(int keep_open) fprintf(stderr, "raising soft limit up to hard limit\n"); rl.rlim_cur = rl.rlim_max; if (setrlimit(RLIMIT_NOFILE, &rl) != 0) { - store_errmsg("setrlimit() failed", our_errno()); + store_errmsg("setrlimit() failed", ERRNO); fprintf(stderr, "%s\n", msgbuff); return -2; } @@ -149,7 +135,7 @@ static int rlimit(int keep_open) /* get current open file limits */ if (getrlimit(RLIMIT_NOFILE, &rl) != 0) { - store_errmsg("getrlimit() failed", our_errno()); + store_errmsg("getrlimit() failed", ERRNO); fprintf(stderr, "%s\n", msgbuff); return -3; } @@ -208,7 +194,7 @@ static int rlimit(int keep_open) } } while (nitems && !memchunk); if (!memchunk) { - store_errmsg("memchunk, malloc() failed", our_errno()); + store_errmsg("memchunk, malloc() failed", ERRNO); fprintf(stderr, "%s\n", msgbuff); return -4; } @@ -263,7 +249,7 @@ static int rlimit(int keep_open) } } while (num_open.rlim_max && !fd); if (!fd) { - store_errmsg("fd, malloc() failed", our_errno()); + store_errmsg("fd, malloc() failed", ERRNO); fprintf(stderr, "%s\n", msgbuff); free(memchunk); return -6; @@ -286,7 +272,7 @@ static int rlimit(int keep_open) fd[0] = open(DEV_NULL, O_RDONLY); if (fd[0] < 0) { sprintf(strbuff, "opening of %s failed", DEV_NULL); - store_errmsg(strbuff, our_errno()); + store_errmsg(strbuff, ERRNO); fprintf(stderr, "%s\n", msgbuff); free(fd); fd = NULL; |