From: Eduard Bagdasaryan Date: Fri, 30 Jul 2021 16:11:08 +0000 (+0000) Subject: Fix doc/debug-messages.dox generation (#871) X-Git-Tag: SQUID_6_0_1~304 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a80e3b44795bc9647857fc47d155a01b3f1a41dd;p=thirdparty%2Fsquid.git Fix doc/debug-messages.dox generation (#871) cache_log_message ID 62 was missing from doc/debug-messages.dox because the code generating that file did not recognize debugs() statements with Critical() or Important() macro inside a conditional operator. Also fixed a related sed regex: sed does not support non-greedy matches. No runtime functionality changes. --- diff --git a/doc/debug-messages.dox b/doc/debug-messages.dox index 7ed7fcfe8e..d1d09f8290 100644 --- a/doc/debug-messages.dox +++ b/doc/debug-messages.dox @@ -60,6 +60,7 @@ ID Message gist 59 Shutdown: Digest authentication. 60 Shutdown: Negotiate authentication. 61 Shutdown: NTLM authentication. +62 ERROR: ... while accepting a TLS connection on ...: ... 63 Resuming indexing cache_dir # ... from ... 64 DNS IPv4 socket created at ..., FD ... \endverbatim diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh index 4a3451d52f..ef6d2b23b6 100755 --- a/scripts/source-maintenance.sh +++ b/scripts/source-maintenance.sh @@ -234,9 +234,9 @@ collectDebugMessagesFrom () # - remove quotes around "strings" # - remove excessive whitespace # - remove debugs() statement termination sugar - grep -o -E '\bdebugs[^,]*,\s*(Critical|Important)[(][0-9]+.*' doc/debug-messages.tmp2 | \ + grep -o -E '\bdebugs[^,]*,[^,]*(Critical|Important)[(][0-9]+.*' doc/debug-messages.tmp2 | \ sed -r \ - -e 's/.*?(Critical|Important)[(]([0-9]+)[)],\s*/\2 /' \ + -e 's/.*(Critical|Important)[(]([0-9]+)[)][^,]*,\s*/\2 /' \ -e 's/<<\s*[(].*[)]\s*(<<|[)];)/<< ... \1/g' \ -e 's/<<\s*[^"]*/.../g' \ -e 's@([^\\])"@\1@g' \