cppcheck.sh and check_dissector_urls.py: Show which files are being examined.

Change-Id: Ib5ecb215050dea6bf2f03014d544dac49e56fe12
Reviewed-on: https://code.wireshark.org/review/37865
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

2 files changed, 23 insertions, 6 deletions

diff --git a/tools/check_dissector_urls.py b/tools/check_dissector_urls.py
index 08166f7168..ae7e636d8c 100755
--- a/tools/check_dissector_urls.py
+++ b/tools/check_dissector_urls.py
@@ -124,6 +124,7 @@ class Link(object):
 
 
 links = []
+files = []
 
 
 def findLinksInFile(filename):
@@ -190,31 +191,43 @@ elif args.commits:
     files = [f.decode('utf-8')
              for f in subprocess.check_output(command).splitlines()]
     # Fetch links from files (dissectors files only)
+    files = list(filter(lambda f : isDissectorFile(f), files))
     for f in files:
-        if isDissectorFile(f):
-            findLinksInFile(f)
+        findLinksInFile(f)
 elif args.open:
     # Unstaged changes.
     command = ['git', 'diff', '--name-only']
     files = [f.decode('utf-8')
              for f in subprocess.check_output(command).splitlines()]
+    files = list(filter(lambda f : isDissectorFile(f), files))
     # Staged changes.
     command = ['git', 'diff', '--staged', '--name-only']
     files_staged = [f.decode('utf-8')
                     for f in subprocess.check_output(command).splitlines()]
+    files_staged = list(filter(lambda f : isDissectorFile(f), files_staged))
     for f in files:
-        if isDissectorFile(f):
-            findLinksInFile(f)
+        findLinksInFile(f)
     for f in files_staged:
         if not f in files:
-            if isDissectorFile(f):
-                findLinksInFile(f)
+            findLinksInFile(f)
+            files.append(f)
 else:
     # Find links from dissector folder.
     findLinksInFolder(os.path.join(os.path.dirname(
         __file__), '..', 'epan', 'dissectors'))
 
 
+# If scanning a subset of files, list them here.
+print('Examining:')
+if args.file or args.commits or args.open:
+    if files:
+        print(' '.join(files), '\n')
+    else:
+        print('No files to check.\n')
+else:
+    print('All dissector modules\n')
+
+
 # Prepare one session for all requests. For args, see
 # https://requests.readthedocs.io/en/master/
 session = requests.Session()
diff --git a/tools/cppcheck/cppcheck.sh b/tools/cppcheck/cppcheck.sh
index 9bf95dc871..41b402a611 100755
--- a/tools/cppcheck/cppcheck.sh
+++ b/tools/cppcheck/cppcheck.sh
@@ -128,6 +128,10 @@ fi
 # runs and we aren't left with broken HTML.
 trap : INT
 
+echo "Examining:"
+echo $TARGET
+echo
+
 # shellcheck disable=SC2086
 $CPPCHECK --force --enable=style $QUIET    \
     $SUPPRESSIONS $INCLUDES \