From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id A8BD83894E60; Thu, 30 Apr 2020 00:37:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A8BD83894E60 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: fix shellcheck warnings SC2166 (&& and !! instead of -a and -o) in gdbarch.sh X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: cb02ab2416c2d83ca053652a21788189f3f7779f X-Git-Newrev: 759cea5e3f7f141abfc2f31d5039cd7f109edf95 Message-Id: <20200430003708.A8BD83894E60@sourceware.org> Date: Thu, 30 Apr 2020 00:37:08 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2020 00:37:08 -0000 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=759cea5e3f7f141abfc2f31d5039cd7f109edf95 commit 759cea5e3f7f141abfc2f31d5039cd7f109edf95 Author: Simon Marchi Date: Wed Apr 29 20:35:34 2020 -0400 gdb: fix shellcheck warnings SC2166 (&& and !! instead of -a and -o) in gdbarch.sh Fix all warnings of this type: In gdbarch.sh line 1238: if [ "x${invalid_p}" = "x0" -a -n "${postdefault}" ] ^-- SC2166: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined. See the rationale here [1]. [1] https://github.com/koalaman/shellcheck/wiki/SC2166 gdb/ChangeLog: * gdbarch.sh: Use shell operators && and || instead of -a and -o. Diff: --- gdb/ChangeLog | 5 +++++ gdb/gdbarch.sh | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d751c052ce9..bf0fdf55a5c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-04-29 Simon Marchi + + * gdbarch.sh: Use shell operators && and || instead of + -a and -o. + 2020-04-29 Simon Marchi * gdbarch.sh: Use $(...) instead of `...`. diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 0e89bd1900b..f1b9276775e 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -156,8 +156,8 @@ EOF fallback_default_p () { - [ -n "${postdefault}" -a "x${invalid_p}" != "x0" ] \ - || [ -n "${predefault}" -a "x${invalid_p}" = "x0" ] + ( [ -n "${postdefault}" ] && [ "x${invalid_p}" != "x0" ] ) \ + || ( [ -n "${predefault}" ] && [ "x${invalid_p}" = "x0" ] ) } class_is_variable_p () @@ -1235,7 +1235,7 @@ EOF kill $$ exit 1 fi - if [ "x${invalid_p}" = "x0" -a -n "${postdefault}" ] + if [ "x${invalid_p}" = "x0" ] && [ -n "${postdefault}" ] then echo "Error: postdefault is useless when invalid_p=0" 1>&2 kill $$ @@ -1921,7 +1921,7 @@ function_list | while do_read do if class_is_function_p || class_is_variable_p then - if [ -n "${predefault}" -a "x${predefault}" != "x0" ] + if [ -n "${predefault}" ] && [ "x${predefault}" != "x0" ] then printf " gdbarch->%s = %s;\n" "$function" "$predefault" fi @@ -2001,11 +2001,11 @@ do then printf " /* Skip verify of %s, has predicate. */\n" "$function" # FIXME: See do_read for potential simplification - elif [ -n "${invalid_p}" -a -n "${postdefault}" ] + elif [ -n "${invalid_p}" ] && [ -n "${postdefault}" ] then printf " if (%s)\n" "$invalid_p" printf " gdbarch->%s = %s;\n" "$function" "$postdefault" - elif [ -n "${predefault}" -a -n "${postdefault}" ] + elif [ -n "${predefault}" ] && [ -n "${postdefault}" ] then printf " if (gdbarch->%s == %s)\n" "$function" "$predefault" printf " gdbarch->%s = %s;\n" "$function" "$postdefault" @@ -2136,7 +2136,7 @@ do fi printf " if (gdbarch_debug >= 2)\n" printf " fprintf_unfiltered (gdb_stdlog, \"gdbarch_%s called\\\\n\");\n" "$function" - if [ "x${actual}" = "x-" -o "x${actual}" = "x" ] + if [ "x${actual}" = "x-" ] || [ "x${actual}" = "x" ] then if class_is_multiarch_p then