Trivial fixes in the smatch tree
cover Trivial fixes in the smatch tree
This is a human being with flesh and blood ...not stupid bot or idiotic AI..
Dan,
Could please pick up these changes to the tree, if and only if, these are viable.
Bhaskar Chowdhury (9):
Replace pipes with a binary for cpu core count
Looks nicer in usage output without the full path of the script Eliminate the full path to the script in usage output Doing it for the consistency in the tree,eliminating the full path to
the script
Again, for the consistency, eliminate full path to the script Trivial fixup to take away the full path of the script Took away the full path to the script
Usage shows without the full path to the script
Trivial changes,usage text show scriptname without path,and few of
them use nproc binary to show cpu core
smatch_scripts/build_generic_data.sh | 2 +- smatch_scripts/build_kernel_data.sh | 2 +- smatch_scripts/filter_kernel_deref_check.sh | 2 +- smatch_scripts/find_null_params.sh | 4 ++-- smatch_scripts/gen_allocation_list.sh | 2 +- smatch_scripts/gen_bit_shifters.sh | 2 +- smatch_scripts/gen_dma_funcs.sh | 2 +- smatch_scripts/gen_implicit_dependencies.sh | 2 +- smatch_scripts/gen_no_return_funcs.sh | 2 +- smatch_scripts/gen_puts_list.sh | 2 +- smatch_scripts/gen_rosenberg_funcs.sh | 2 +- smatch_scripts/gen_sizeof_param.sh | 2 +- smatch_scripts/gen_unwind_functions.sh | 2 +- smatch_scripts/kpatch.sh | 2 +- smatch_scripts/show_errs.sh | 2 +- smatch_scripts/show_ifs.sh | 2 +- smatch_scripts/show_unreachable.sh | 2 +- smatch_scripts/summarize_errs.sh | 2 +- smatch_scripts/test_generic.sh | 4 ++-- smatch_scripts/test_kernel.sh | 4 ++-- smatch_scripts/whitespace_only.sh | 4 ++-- smatch_scripts/wine_checker.sh | 4 ++-- 22 files changed, 27 insertions(+), 27 deletions(-)
--
2.46.3
PATCH 1/9 Replace pipes with a binary for cpu core count
Change the piped series with nproc binary,hopefully for better readability
--- smatch_scripts/build_generic_data.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
smatch_scripts/build_generic_data.sh +1 -1
@@ -3,7 +3,7 @@ # This is a generic script to parse --info output. For the kernel, don't use # this script, use build_kernel_data.sh instead. -NR_CPU=$(cat /proc/cpuinfo | grep ^processor | wc -l) +NR_CPU=$(nproc) SCRIPT_DIR=$(dirname $0) DATA_DIR=smatch_data PROJECT=smatch_generic
--
2.46.3
PATCH 2/9 Looks nicer in usage output without the full path of the script
In reply to Bhaskar ChowdhuryAdd basename to scriptname for the clean look of the output.
--- smatch_scripts/build_kernel_data.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
smatch_scripts/build_kernel_data.sh +1 -1
@@ -6,7 +6,7 @@ PROJECT=kernel function usage { echo - echo "Usage: $0" + echo "Usage: $(basename $0)" echo "Updates the smatch_data/ directory and builds the smatch database" echo exit 1
--
2.46.3
PATCH 3/9 Eliminate the full path to the script in usage output
In reply to Bhaskar ChowdhuryClean to the usage outputted text without full path of the script
--- smatch_scripts/filter_kernel_deref_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
smatch_scripts/filter_kernel_deref_check.sh +1 -1
@@ -2,7 +2,7 @@ file=$1 if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages>" + echo "Usage: $(basename $0) <file with smatch messages>" exit 1 fi
--
2.46.3
PATCH 4/9 Doing it for the consistency in the tree,eliminating the full path to the script
In reply to Bhaskar ChowdhuryJust try to making things consistent across the tree by eliminating full path to the script.
--- smatch_scripts/find_null_params.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
smatch_scripts/find_null_params.sh +2 -2
@@ -3,7 +3,7 @@ file=$1 if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages>" + echo "Usage: $(basename $0) <file with smatch messages>" exit 1 fi
@@ -13,7 +13,7 @@ cat null_calls.txt unchecked | sort | uniq -d > null_params.txt IFS=" " for i in $(cat null_params.txt) ; do - grep "$i" $file | grep -w undefined + grep "$i" $file | grep -w undefined done
--
2.46.3
Re: [PATCH 4/9] Doing it for the consistency in the tree,eliminating the full path to the script
Quoted 13 lines · Bhaskar Chowdhury
Just try to making things consistent across the tree by eliminating full path to the script.
Signed-off-by Bhaskar Chowdhury <[email protected]>--- smatch_scripts/find_null_params.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)smatch_scripts/find_null_params.sh +0
-0
smatch_scripts/find_null_params.sh line 6
Quoted 5 lines
smatch_scripts/find_null_params.sh +1
-1@@ -3,7 +3,7 @@ file=$1 if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages>" + echo "Usage: $(basename $0) <file with smatch messages>"
I don't love tab indents for bash scripts. I know that the kernel does this for scripts but I don't love it there either. So I've been hand editing these patches. It's easy for me to hand edit these in my email client so no worries.
smatch_scripts/find_null_params.sh cat null_calls.txt unchecked | sort | uniq -d > null_params.txt · line 16
Quoted 9 lines
smatch_scripts/find_null_params.sh +1
-1exit 1 fi@@ -13,7 +13,7 @@ cat null_calls.txt unchecked | sort | uniq -d > null_params.txt IFS=" " for i in $(cat null_params.txt) ; do - grep "$i" $file | grep -w undefined + grep "$i" $file | grep -w undefined
In this case I think you were removing a space from the end of the line but somehow your email client seems to have deleted it so the patch didn't apply. I did this manually as well, but you may want to fix that.
Anyway, all of these are applied now.
regards,
dan carpenter
PATCH 5/9 Again, for the consistency, eliminate full path to the script
In reply to Bhaskar ChowdhuryJust for the cleanliness.
--- smatch_scripts/gen_allocation_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
smatch_scripts/gen_allocation_list.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
--
2.46.3
PATCH 6/9 Trivial fixup to take away the full path of the script
In reply to Bhaskar ChowdhuryJust for the cleanliness.Full path to the script removed.
--- smatch_scripts/gen_bit_shifters.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
smatch_scripts/gen_bit_shifters.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
--
2.46.3
PATCH 7/9 Took away the full path to the script
In reply to Bhaskar ChowdhuryEliminate full to the script.
--- smatch_scripts/gen_dma_funcs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
smatch_scripts/gen_dma_funcs.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
--
2.46.3
PATCH 8/9 Usage shows without the full path to the script
In reply to Bhaskar ChowdhuryEliminate full path to the script.
--- smatch_scripts/gen_implicit_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
smatch_scripts/gen_implicit_dependencies.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
--
2.46.3
PATCH 9/9 Trivial changes,usage text show scriptname without path,and few of them use nproc binary to show cpu core
In reply to Bhaskar ChowdhuryTrivial fixes for the script name to show up in help/usage test without full pathname and some of them have CPU core variable via nproc.
--- smatch_scripts/gen_no_return_funcs.sh | 2 +- smatch_scripts/gen_puts_list.sh | 2 +- smatch_scripts/gen_rosenberg_funcs.sh | 2 +- smatch_scripts/gen_sizeof_param.sh | 2 +- smatch_scripts/gen_unwind_functions.sh | 2 +- smatch_scripts/kpatch.sh | 2 +- smatch_scripts/show_errs.sh | 2 +- smatch_scripts/show_ifs.sh | 2 +- smatch_scripts/show_unreachable.sh | 2 +- smatch_scripts/summarize_errs.sh | 2 +- smatch_scripts/test_generic.sh | 4 ++-- smatch_scripts/test_kernel.sh | 4 ++-- smatch_scripts/whitespace_only.sh | 4 ++-- smatch_scripts/wine_checker.sh | 4 ++-- 14 files changed, 18 insertions(+), 18 deletions(-)
smatch_scripts/gen_no_return_funcs.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
smatch_scripts/gen_puts_list.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
smatch_scripts/gen_rosenberg_funcs.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
smatch_scripts/gen_sizeof_param.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
smatch_scripts/gen_unwind_functions.sh +1 -1
@@ -4,7 +4,7 @@ file=$1 project=$(echo "$2" | cut -d = -f 2) if [[ "$file" = "" ]] ; then - echo "Usage: $0 <file with smatch messages> -p=<project>" + echo "Usage: $(basename $0) <file with smatch messages> -p=<project>" exit 1 fi
smatch_scripts/kpatch.sh +1 -1
@@ -4,7 +4,7 @@ TMP_DIR=/tmp help() { - echo "Usage: $0 [--no-compile|--amend] <filename>" + echo "Usage: $(basename $0) [--no-compile|--amend] <filename>" echo "You must be at the base of the kernel tree to run this." exit 1 }
smatch_scripts/show_errs.sh +1 -1
@@ -15,7 +15,7 @@ done file=$1 [ "$file" = "" ] && [ -e err-list ] && file=err-list if [[ "$file" = "" ]] ; then - echo "Usage: $0 [-C <lines>] [-b] [-k] <file with smatch messages>" + echo "Usage: $(basename $0) [-C <lines>] [-b] [-k] <file with smatch messages>" echo " -C <lines>: Print <lines> of context" exit 1 fi
smatch_scripts/show_ifs.sh +1 -1
@@ -9,7 +9,7 @@ fi file=$1 if [[ "$file" = "" ]] ; then - echo "Usage: $0 [-C <lines of context>] <file with smatch messages>" + echo "Usage: $(basename $0) [-C <lines of context>] <file with smatch messages>" exit 1 fi
smatch_scripts/show_unreachable.sh +1 -1
@@ -24,7 +24,7 @@ done file=$1 if [[ "$file" = "" ]] ; then - echo "Usage: $0 [-C <lines>] [-b] [-k] <file with smatch messages>" + echo "Usage: $(basename $0) [-C <lines>] [-b] [-k] <file with smatch messages>" echo " -C <lines>: Print <lines> of context" echo " -b : Ignore unreachable break statements" echo " -k : Ignore some kernel defines"
smatch_scripts/summarize_errs.sh +1 -1
@@ -2,7 +2,7 @@ print_help() { - echo "usage: $0 <warning file>" + echo "usage: $(basename $0) <warning file>" exit 1; }
smatch_scripts/test_generic.sh +2 -2
@@ -1,12 +1,12 @@ #!/bin/bash -NR_CPU=$(cat /proc/cpuinfo | grep ^processor | wc -l) +NR_CPU=$(nproc) TARGET="" WLOG="smatch_warns.txt" LOG="smatch_compile.warns" function usage { echo - echo "Usage: $0 [smatch options]" + echo "Usage: $(basename $0) [smatch options]" echo "Compiles the kernel with -j${NR_CPU}" echo " available options:" echo " --endian : enable endianness check"
smatch_scripts/test_kernel.sh +2 -2
@@ -2,13 +2,13 @@ set -e -NR_CPU=$(cat /proc/cpuinfo | grep ^processor | wc -l) +NR_CPU=$(nproc) TARGET="bzImage modules" WLOG="smatch_warns.txt" LOG="smatch_compile.warns" function usage { echo - echo "Usage: $0 [smatch options]" + echo "Usage: $(basename $0) [smatch options]" echo "Compiles the kernel with -j${NR_CPU}" echo " available options:" echo " --endian : enable endianness check"
smatch_scripts/whitespace_only.sh +2 -2
@@ -2,7 +2,7 @@ usage() { - echo "usage: $0 <patch file>" + echo "usage: $(basename $0) <patch file>" exit 1 }
@@ -84,7 +84,7 @@ for file in $files ; do echo '!! !!' echo '!!#$%@$%@^@#$^@#%@$%@$%@#%$@#%!!' - diff -u $before $after + diff -u $before $after fi rm -f $before $after $tmpfile done
smatch_scripts/wine_checker.sh +2 -2
@@ -1,7 +1,7 @@ #!/bin/bash function usage { - echo "Usage: $0 [--sparse][--valgrind][--debug] path/to/file.c" + echo "Usage: $(basename $0) [--sparse][--valgrind][--debug] path/to/file.c" exit 1 }
@@ -14,7 +14,7 @@ else echo "Smatch binary not found." exit 1 fi - + POST="" WINE_ARGS="-p=wine --full-path -D__i386__"
--
2.46.3