From: Jan Beulich Date: Mon, 3 Feb 2025 10:55:54 +0000 (+0100) Subject: bpf: use is_whitespace() X-Git-Tag: binutils-2_45~1758 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72c260c6af01297f710cf13de4e062549c1e58d1;p=thirdparty%2Fbinutils-gdb.git bpf: use is_whitespace() Wherever blanks are permissible in input, tabs ought to be permissible, too. This is particularly relevant when -f is passed to gas (alongside appropriate input). Various redundant nul char checks are also dropped, where adjacent. At the same time use is_end_of_stmt() instead of an open-coded nul char check. --- diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c index 91ef7b3a49c..84eab3f88af 100644 --- a/gas/config/tc-bpf.c +++ b/gas/config/tc-bpf.c @@ -1274,7 +1274,7 @@ parse_expression (char *s, expressionS *exp) these whitespaces. */ { char *p; - for (p = s - 1; p >= saved_s && *p == ' '; --p) + for (p = s - 1; p >= saved_s && is_whitespace (*p); --p) --s; } @@ -1501,7 +1501,7 @@ md_assemble (char *str ATTRIBUTE_UNUSED) if (*p == ' ') { /* Expect zero or more spaces. */ - while (*s != '\0' && (*s == ' ' || *s == '\t')) + while (is_whitespace (*s)) s += 1; p += 1; } @@ -1520,20 +1520,20 @@ md_assemble (char *str ATTRIBUTE_UNUSED) else if (*(p + 1) == 'w') { /* Expect zero or more spaces. */ - while (*s != '\0' && (*s == ' ' || *s == '\t')) + while (is_whitespace (*s)) s += 1; p += 2; } else if (*(p + 1) == 'W') { /* Expect one or more spaces. */ - if (*s != ' ' && *s != '\t') + if (!is_whitespace (*s)) { PARSE_ERROR ("expected white space, got '%s'", s); break; } - while (*s != '\0' && (*s == ' ' || *s == '\t')) + while (is_whitespace (*s)) s += 1; p += 2; } @@ -1620,7 +1620,7 @@ md_assemble (char *str ATTRIBUTE_UNUSED) if (p[1] == 'I') { - while (*s == ' ' || *s == '\t') + while (is_whitespace (*s)) s += 1; if (*s != '+' && *s != '-') { @@ -1643,7 +1643,7 @@ md_assemble (char *str ATTRIBUTE_UNUSED) { char *exp = NULL; - while (*s == ' ' || *s == '\t') + while (is_whitespace (*s)) s += 1; if (*s != '+' && *s != '-') { @@ -1735,9 +1735,9 @@ md_assemble (char *str ATTRIBUTE_UNUSED) if (*p == '\0') { /* Allow white spaces at the end of the line. */ - while (*s != '\0' && (*s == ' ' || *s == '\t')) + while (is_whitespace (*s)) s += 1; - if (*s == '\0') + if (is_end_of_stmt (*s)) /* We parsed an instruction successfully. */ break; PARSE_ERROR ("extra junk at end of line");