use macros ERRNO, SET_ERRNO(), SOCKERRNO and SET_SOCKERRNO() for errno handling

1 files changed, 6 insertions, 20 deletions

diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index 368b902ae..413168c60 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -46,20 +46,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)
@@ -102,7 +88,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;
   }
@@ -145,7 +131,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;
     }
@@ -153,7 +139,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;
     }
@@ -233,7 +219,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 -5;
   }
@@ -268,7 +254,7 @@ static int rlimit(int keep_open)
 
   fd = malloc(sizeof(*fd) * (size_t)(num_open.rlim_max));
   if (!fd) {
-    store_errmsg("fd, malloc() failed", our_errno());
+    store_errmsg("fd, malloc() failed", ERRNO);
     fprintf(stderr, "%s\n", msgbuff);
     free(memchunk);
     return -7;
@@ -291,7 +277,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;