From: Robert Spalek Date: Sun, 30 Apr 2006 11:14:40 +0000 (+0200) Subject: conf: expand a macro call, because it's used only once X-Git-Tag: holmes-import~645^2~6 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=87ce453f37bc02a5d38b7ef8fd8ddfe6ae6c84ca;p=libucw.git conf: expand a macro call, because it's used only once --- diff --git a/lib/conf-input.c b/lib/conf-input.c index 786725bd..2abb7a21 100644 --- a/lib/conf-input.c +++ b/lib/conf-input.c @@ -64,9 +64,6 @@ append(byte *start, byte *end) copy_buf.ptr[copied-1] = 0; } -#define CONTROL_CHAR(x) (x == '{' || x == '}' || x == ';') - // these characters separate words like blanks - static byte * get_word(uns is_command_name) { @@ -121,7 +118,8 @@ get_word(uns is_command_name) } else { // promised that *line is non-null and non-blank byte *start = line; - while (*line && !Cblank(*line) && !CONTROL_CHAR(*line) + while (*line && !Cblank(*line) + && *line != '{' && *line != '}' && *line != ';' && (*line != '=' || !is_command_name)) line++; if (*line == '=') { // nice for setting from a command-line