Commit 73192968 authored by Quentin Monnet's avatar Quentin Monnet Committed by Alexei Starovoitov

bpftool: Clean up _bpftool_once_attr() calls in bash completion

In bpftool's bash completion file, function _bpftool_once_attr() is able
to process multiple arguments. There are a few locations where this
function is called multiple times in a row, each time for a single
argument; let's pass all arguments instead to minimize the number of
function calls required for the completion.
Signed-off-by: default avatarQuentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/r/20230405132120.59886-8-quentin@isovalent.comSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 7483a7a7
...@@ -508,10 +508,7 @@ _bpftool() ...@@ -508,10 +508,7 @@ _bpftool()
;; ;;
*) *)
COMPREPLY=( $( compgen -W "map" -- "$cur" ) ) COMPREPLY=( $( compgen -W "map" -- "$cur" ) )
_bpftool_once_attr 'type' _bpftool_once_attr 'type dev pinmaps autoattach'
_bpftool_once_attr 'dev'
_bpftool_once_attr 'pinmaps'
_bpftool_once_attr 'autoattach'
return 0 return 0
;; ;;
esac esac
...@@ -736,16 +733,10 @@ _bpftool() ...@@ -736,16 +733,10 @@ _bpftool()
esac esac
;; ;;
*) *)
_bpftool_once_attr 'type' _bpftool_once_attr 'type key value entries name flags dev'
_bpftool_once_attr 'key'
_bpftool_once_attr 'value'
_bpftool_once_attr 'entries'
_bpftool_once_attr 'name'
_bpftool_once_attr 'flags'
if _bpftool_search_list 'array_of_maps' 'hash_of_maps'; then if _bpftool_search_list 'array_of_maps' 'hash_of_maps'; then
_bpftool_once_attr 'inner_map' _bpftool_once_attr 'inner_map'
fi fi
_bpftool_once_attr 'dev'
return 0 return 0
;; ;;
esac esac
...@@ -886,8 +877,7 @@ _bpftool() ...@@ -886,8 +877,7 @@ _bpftool()
return 0 return 0
;; ;;
*) *)
_bpftool_once_attr 'cpu' _bpftool_once_attr 'cpu index'
_bpftool_once_attr 'index'
return 0 return 0
;; ;;
esac esac
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment