File tree 2 files changed +3
-3
lines changed
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -197,11 +197,11 @@ REGEXP_IGNORE_KNOWN_VIOLATIONS=$(join_array "|" "${KNOWN_VIOLATIONS[@]}")
197
197
198
198
# Invoke "git grep" only once in order to minimize run-time
199
199
REGEXP_LOCALE_DEPENDENT_FUNCTIONS=$( join_array " |" " ${LOCALE_DEPENDENT_FUNCTIONS[@]} " )
200
- GIT_GREP_OUTPUT=$( git grep -E " [^a-zA-Z0-9_\` '\" <>](${REGEXP_LOCALE_DEPENDENT_FUNCTIONS} (| _r|_s))[^a-zA-Z0-9_\` '\" <>]" -- " *.cpp" " *.h" )
200
+ GIT_GREP_OUTPUT=$( git grep -E " [^a-zA-Z0-9_\` '\" <>](${REGEXP_LOCALE_DEPENDENT_FUNCTIONS} (_r|_s)? )[^a-zA-Z0-9_\` '\" <>]" -- " *.cpp" " *.h" )
201
201
202
202
EXIT_CODE=0
203
203
for LOCALE_DEPENDENT_FUNCTION in " ${LOCALE_DEPENDENT_FUNCTIONS[@]} " ; do
204
- MATCHES=$( grep -E " [^a-zA-Z0-9_\` '\" <>]${LOCALE_DEPENDENT_FUNCTION} (| _r|_s)[^a-zA-Z0-9_\` '\" <>]" <<< " ${GIT_GREP_OUTPUT}" | \
204
+ MATCHES=$( grep -E " [^a-zA-Z0-9_\` '\" <>]${LOCALE_DEPENDENT_FUNCTION} (_r|_s)? [^a-zA-Z0-9_\` '\" <>]" <<< " ${GIT_GREP_OUTPUT}" | \
205
205
grep -vE " \.(c|cpp|h):\s*(//|\*|/\*|\" ).*${LOCALE_DEPENDENT_FUNCTION} " | \
206
206
grep -vE ' fprintf\(.*(stdout|stderr)' )
207
207
if [[ ${REGEXP_IGNORE_EXTERNAL_DEPENDENCIES} != " " ]]; then
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ for SHELL_SCRIPT in $(git ls-files -- "*.sh" | grep -vE "src/(secp256k1|univalue
16
16
if grep -q " # This script is intentionally locale dependent by not setting \" export LC_ALL=C\" " " ${SHELL_SCRIPT} " ; then
17
17
continue
18
18
fi
19
- FIRST_NON_COMMENT_LINE=$( grep -vE ' ^(#.*|) $' " ${SHELL_SCRIPT} " | head -1)
19
+ FIRST_NON_COMMENT_LINE=$( grep -vE ' ^(#.*)? $' " ${SHELL_SCRIPT} " | head -1)
20
20
if [[ ${FIRST_NON_COMMENT_LINE} != " export LC_ALL=C" && ${FIRST_NON_COMMENT_LINE} != " export LC_ALL=C.UTF-8" ]]; then
21
21
echo " Missing \" export LC_ALL=C\" (to avoid locale dependence) as first non-comment non-empty line in ${SHELL_SCRIPT} "
22
22
EXIT_CODE=1
You can’t perform that action at this time.
0 commit comments