From d387cfdddd7a843cb6538186ae32222b6d7690a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 27 Nov 2017 22:01:48 +0000 Subject: [PATCH] pid1: clarify that min_max is always initialized read_one_line_file() always returns <= 0, so the code was OK, but let's write the check a bit differently to make it obvious that min_max is always set. --- src/core/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/main.c b/src/core/main.c index d77946194c..b7fb9b3524 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1237,7 +1237,7 @@ static int bump_rlimit_nofile(struct rlimit *saved_rlimit) { /* Get current RLIMIT_NOFILE maximum compiled into the kernel. */ r = read_one_line_file("/proc/sys/fs/nr_open", &nr_open); - if (r == 0) + if (r >= 0) r = safe_atoi(nr_open, &min_max); /* If we fail, fallback to the hard-coded kernel limit of 1024 * 1024. */ if (r < 0)