Merge branch 'jc/maint-log-grep-all-match-1'

A finishing touch to make two symbols that were meant to be file-scope static really so. * jc/maint-log-grep-all-match-1: grep.c: make two symbols really file-scope static this time