Commit a5d9fd29 authored by Philip Withnall's avatar Philip Withnall

Merge branch '1044-prlimit-fix' into 'master'

Fix prlimit() error handling in tests

Closes #1044

See merge request GNOME/glib!164
parents ad3947c4 6be9f065
......@@ -21,6 +21,7 @@
*/
#include <config.h>
#include <errno.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
......@@ -146,8 +147,8 @@ test_thread4 (void)
getrlimit (RLIMIT_NPROC, &nl);
nl.rlim_cur = 1;
if ((ret = prlimit (getpid(), RLIMIT_NPROC, &nl, &ol)) != 0)
g_error ("prlimit failed: %s", g_strerror (ret));
if ((ret = prlimit (getpid (), RLIMIT_NPROC, &nl, &ol)) != 0)
g_error ("prlimit failed: %s", g_strerror (errno));
error = NULL;
thread = g_thread_try_new ("a", thread1_func, NULL, &error);
......@@ -156,7 +157,7 @@ test_thread4 (void)
g_error_free (error);
if ((ret = prlimit (getpid (), RLIMIT_NPROC, &ol, NULL)) != 0)
g_error ("resetting RLIMIT_NPROC failed: %s", g_strerror (ret));
g_error ("resetting RLIMIT_NPROC failed: %s", g_strerror (errno));
#endif
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment