Merge 020b714faa into 3287c3dd30

src/_cppcheck

@@ -1,4 +1,4 @@
-#compdef cppcheck cppcheck-htmlreport
+#compdef cppcheck
 # ------------------------------------------------------------------------------
 # Copyright (c) 2019 Github zsh-users - https://github.com/zsh-users
 # All rights reserved.
@@ -48,11 +48,7 @@ _cppcheck_files() {
   _path_files -/ -g "*.(c|cpp|cxx|h|hpp|C)"
 }
 
-_cppcheck_author_information() {
-  local -a info=(name email date)
-  _values -s ',' 'info' $info
-}
-
+_cppcheck() {
   local -a check_ids=(
     all warning style performance portability information unusedFunction missingInclude
   )
@@ -64,20 +60,6 @@ local -a coding_standards=(
     misra-cpp-2008 misra-cpp-2023
   )
 
-case $service in
-  (cppcheck-htmlreport)
-    _arguments \
-      '(- *)'{-h,--help}'[show help message and exit]' \
-      '--title[Title of the project]:title' \
-      '*--file[cppcheck xml output file to read defects from(default stdin)]:file:_files' \
-      '--checkers-report-file[cppcheck checkers report file]:file:_files' \
-      '--report-dir[Directory where the HTML report content is written]:dir:_files -/' \
-      '--source-dir[Base directory where source code files can be found or a URL to a remote]:dir:_files -/' \
-      '--add-author-information[Blame information to include(default "name,email,date")]:info:_cppcheck_author_information' \
-      '--source-encoding[Encoding of source code]:encoding' \
-      '--blame-options[Blame options which you can use to get author and author mail]:options'
-    ;;
-  (cppcheck)
   _arguments \
     "--addon=[Execute addon]" \
     "--addon-python=[Specify the python interpreter]: :_files" \
@@ -140,8 +122,9 @@ case $service in
     "--version[Print out version number]" \
     "--xml[Write results in xml format to stderr]" \
     "*: :_cppcheck_files"
-    ;;
-esac
+}
+
+_cppcheck "$@"
 
 # Local Variables:
 # mode: Shell-Script