conf_parse_rlimit(): Refactor, replace 'new' with 'cfg'

'new' is a reserved keyword in C++, it is recommnded to avoid it also in C.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2017-11-12 14:57:22 +01:00
1 parent 6826d7ee3f
commit bf4a0abe5c
1 file changed
+4 -4
+4 -4
View File
@@ -166,7 +166,7 @@ static const struct rlimit_name rlimit_names[] = {
void conf_parse_rlimit(char *line) void conf_parse_rlimit(char *line)
{ {
struct rlimit rlim; struct rlimit rlim;
rlim_t new, *set; rlim_t cfg, *set;
const struct rlimit_name *name; const struct rlimit_name *name;
int resource = -1; int resource = -1;
@@ -196,11 +196,11 @@ void conf_parse_rlimit(char *line)
goto fail; goto fail;
if (!strcmp(tok, "infinity")) { if (!strcmp(tok, "infinity")) {
new = RLIM_INFINITY; cfg = RLIM_INFINITY;
} else { } else {
const char *err = NULL; const char *err = NULL;
new = strtonum(tok, 0, (long long)2 << 31, &err); cfg = strtonum(tok, 0, (long long)2 << 31, &err);
if (err) if (err)
goto fail; goto fail;
} }
@@ -208,7 +208,7 @@ void conf_parse_rlimit(char *line)
if (getrlimit(resource, &rlim)) if (getrlimit(resource, &rlim))
goto fail; goto fail;
*set = new; *set = cfg;
if (setrlimit(resource, &rlim)) if (setrlimit(resource, &rlim))
goto fail; goto fail;