MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb-add-index.sh: Remove use of non posix 'local'

Browse Source 
While working on gdb-add-index.sh, it appeared that it uses the non
POSIX 'local' keyword.  Instead of using local to allow variable
shadowing, I rename the local one to avoid name conflicts altogether.

This commit gets rid of the following shellcheck warning:

    In gdb-add-index.sh line 63:
        local file="$1"
        ^--------^ SC2039: In POSIX sh, 'local' is undefined.

gdb/ChangeLog:

	* contrib/gdb-add-index.sh: Avoid variable shadowing and get
	rid of 'local'.
This commit is contained in:
Lancelot SIX 2021-03-26 16:46:57 +00:00
parent f4655dee77
commit efe1ecd834
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2021-03-26 Lancelot Six <lsix@lancelotsix.com>
* contrib/gdb-add-index.sh: Avoid variable shadowing and get
rid of 'local'.
2021-03-26 Tom Tromey <tom@tromey.com> 2021-03-26 Tom Tromey <tom@tromey.com>
* symtab.c (struct output_source_filename_data): Add 'output' * symtab.c (struct output_source_filename_data): Add 'output'

25
gdb/contrib/gdb-add-index.sh
View File

@ -60,13 +60,13 @@ fi
set_files () set_files ()
{ {
local file="$1" fpath="$1"
index4="${file}.gdb-index" index4="${fpath}.gdb-index"
index5="${file}.debug_names" index5="${fpath}.debug_names"
debugstr="${file}.debug_str" debugstr="${fpath}.debug_str"
debugstrmerge="${file}.debug_str.merge" debugstrmerge="${fpath}.debug_str.merge"
debugstrerr="${file}.debug_str.err" debugstrerr="${fpath}.debug_str.err"
} }
tmp_files= tmp_files=
@ -99,13 +99,12 @@ status=0
handle_file () handle_file ()
{ {
local file fpath="$1"
file="$1"
set_files "$file" set_files "$fpath"
if test -f "$index4" -a -f "$index5"; then if test -f "$index4" -a -f "$index5"; then
echo "$myname: Both index types were created for $file" 1>&2 echo "$myname: Both index types were created for $fpath" 1>&2
status=1 status=1
elif test -f "$index4" -o -f "$index5"; then elif test -f "$index4" -o -f "$index5"; then
if test -f "$index4"; then if test -f "$index4"; then
@ -118,7 +117,7 @@ handle_file ()
debugstradd=false debugstradd=false
debugstrupdate=false debugstrupdate=false
if test -s "$debugstr"; then if test -s "$debugstr"; then
if ! $OBJCOPY --dump-section .debug_str="$debugstrmerge" "$file" \ if ! $OBJCOPY --dump-section .debug_str="$debugstrmerge" "$fpath" \
/dev/null 2>$debugstrerr; then /dev/null 2>$debugstrerr; then
cat >&2 $debugstrerr cat >&2 $debugstrerr
exit 1 exit 1
@ -142,11 +141,11 @@ handle_file ()
if $debugstrupdate; then \ if $debugstrupdate; then \
echo --update-section .debug_str="$debugstrmerge"; \ echo --update-section .debug_str="$debugstrmerge"; \
fi) \ fi) \
"$file" "$file" "$fpath" "$fpath"
status=$? status=$?
else else
echo "$myname: No index was created for $file" 1>&2 echo "$myname: No index was created for $fpath" 1>&2
echo "$myname: [Was there no debuginfo? Was there already an index?]" \ echo "$myname: [Was there no debuginfo? Was there already an index?]" \
1>&2 1>&2
fi fi