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 7ed7fcfe8eb816d1ec302a1148edfc60dcf57a89..d1d09f8290c2ff240527ecf60c0338063cccb07f 100644 (file)
--- 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 4a3451d52fbd9f0762e9d424288bb34e217423b0..ef6d2b23b65c045ec8687093627d0cea2dca0128 100755 (executable)
--- 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' \