diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2018-07-11 10:03:44 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-07-11 10:03:44 +0000 |
| commit | a5d9fd29004faee3259c6cef823ca020458649a3 (patch) | |
| tree | f626a0c485c1ee8f32dbfa169a73ddee938b8d67 | |
| parent | ad3947c42ee4b695b8371abc8d99cadf66a92829 (diff) | |
| parent | 6be9f065cb74d8f0a072724a8a2adb12f07cb7d5 (diff) | |
| download | glib-a5d9fd29004faee3259c6cef823ca020458649a3.tar.gz | |
Merge branch '1044-prlimit-fix' into 'master'
Fix prlimit() error handling in tests
Closes #1044
See merge request GNOME/glib!164
| -rw-r--r-- | glib/tests/thread.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/glib/tests/thread.c b/glib/tests/thread.c index b80019009..b9f87967b 100644 --- a/glib/tests/thread.c +++ b/glib/tests/thread.c @@ -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 } |