diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-04-29 20:35:34 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2020-04-29 20:35:34 -0400 |
| commit | 759cea5e3f7f141abfc2f31d5039cd7f109edf95 (patch) | |
| tree | 90dbb8dcc0a47fb278aa018316d585469ae16a5f /gdb | |
| parent | cb02ab2416c2d83ca053652a21788189f3f7779f (diff) | |
| download | gdb-759cea5e3f7f141abfc2f31d5039cd7f109edf95.zip gdb-759cea5e3f7f141abfc2f31d5039cd7f109edf95.tar.gz gdb-759cea5e3f7f141abfc2f31d5039cd7f109edf95.tar.bz2 | |
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.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d751c05..bf0fdf5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-04-29 Simon Marchi <simon.marchi@efficios.com> + * gdbarch.sh: Use shell operators && and || instead of + -a and -o. + +2020-04-29 Simon Marchi <simon.marchi@efficios.com> + * gdbarch.sh: Use $(...) instead of `...`. 2020-04-29 Simon Marchi <simon.marchi@efficios.com> diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 0e89bd1..f1b9276 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 |