[exim-cvs] Debug: indentation

Góra strony
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Dla: exim-cvs
Temat: [exim-cvs] Debug: indentation
Gitweb: https://git.exim.org/exim.git/commitdiff/32a167571d19dc17c709616320917276e8d82c3b
Commit:     32a167571d19dc17c709616320917276e8d82c3b
Parent:     6748707c644648e9dc1c7f6249cf443aca8a0d13
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Jun 20 15:17:53 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Jun 20 17:21:23 2024 +0100

    Debug: indentation
---
 src/src/retry.c  |  35 +++++++++---------
 test/runtest     |   6 ++--
 test/stderr/0264 |  26 +++++++-------
 test/stderr/0275 |   8 ++---
 test/stderr/0278 |   8 ++---
 test/stderr/0357 |  70 ++++++++++++++++++------------------
 test/stderr/0358 |  68 +++++++++++++++++------------------
 test/stderr/0386 |  16 ++++-----
 test/stderr/0388 |  86 ++++++++++++++++++++++----------------------
 test/stderr/0402 |  24 ++++++-------
 test/stderr/0404 |  20 +++++------
 test/stderr/0408 |   8 ++---
 test/stderr/0487 |   8 ++---
 test/stderr/0529 |  34 +++++++++---------
 test/stderr/0554 |  32 ++++++++---------
 test/stderr/2600 |   8 ++---
 test/stderr/2610 |   8 ++---
 test/stderr/2620 |   8 ++---
 test/stderr/5004 |  12 +++----
 test/stderr/5005 | 108 +++++++++++++++++++++++++++----------------------------
 test/stderr/5006 |   8 ++---
 21 files changed, 300 insertions(+), 301 deletions(-)

diff --git a/src/src/retry.c b/src/src/retry.c
index 9dfe1d587..90319d9d7 100644
--- a/src/src/retry.c
+++ b/src/src/retry.c
@@ -545,11 +545,10 @@ void
 retry_update(address_item ** addr_defer, address_item ** addr_failed,
   address_item ** addr_succeed)
 {
-open_db dbblock;
-open_db *dbm_file = NULL;
+open_db dbblock, * dbm_file = NULL;
 time_t now = time(NULL);
 
-DEBUG(D_retry) debug_printf("Processing retry items\n");
+DEBUG(D_retry) { debug_printf("Processing retry items\n"); acl_level++; }
 
 /* Three-times loop to handle succeeded, failed, and deferred addresses.
 Deferred addresses must be handled after failed ones, because some may be moved
@@ -562,7 +561,7 @@ for (int i = 0; i < 3; i++)
   address_item ** paddr = i==0 ? addr_succeed : i==1 ? addr_failed : addr_defer;
   address_item ** saved_paddr = NULL;
 
-  DEBUG(D_retry) debug_printf("%s addresses:\n",
+  DEBUG(D_retry) debug_printf_indent("%s addresses:\n",
     i == 0 ? "Succeeded" : i == 1 ? "Failed" : "Deferred");
 
   /* Loop for each address on the chain. For deferred addresses, the whole
@@ -584,7 +583,7 @@ for (int i = 0; i < 3; i++)
       int update_count = 0;
       int timedout_count = 0;
 
-      DEBUG(D_retry) debug_printf(" %s%s\n", addr->address,
+      DEBUG(D_retry) debug_printf_indent(" %s%s\n", addr->address,
            addr->retries ? "" : ": no retry items");
 
       /* Loop for each retry item. */
@@ -609,7 +608,7 @@ for (int i = 0; i < 3; i++)
         if (!dbm_file)
           {
           DEBUG(D_deliver|D_retry|D_hints_lookup)
-            debug_printf("retry database not available for updating\n");
+            debug_printf_indent("retry database not available for updating\n");
           return;
           }
 
@@ -631,7 +630,7 @@ for (int i = 0; i < 3; i++)
           {
           (void)dbfn_delete(dbm_file, rti->key);
           DEBUG(D_retry)
-            debug_printf("deleted retry information for %s\n", rti->key);
+            debug_printf_indent("deleted retry information for %s\n", rti->key);
           continue;
           }
 
@@ -651,7 +650,7 @@ for (int i = 0; i < 3; i++)
              rti->flags & rf_host ? addr->domain : NULL,
              rti->basic_errno, rti->more_errno)))
           {
-          DEBUG(D_retry) debug_printf("No configured retry item for %s%s%s\n",
+          DEBUG(D_retry) debug_printf_indent("No configured retry item for %s%s%s\n",
             rti->key,
             rti->flags & rf_host ? US" or " : US"",
             rti->flags & rf_host ? addr->domain : US"");
@@ -661,11 +660,11 @@ for (int i = 0; i < 3; i++)
 
         DEBUG(D_retry)
           if (rti->flags & rf_host)
-            debug_printf("retry for %s (%s) = %s %d %d\n", rti->key,
+            debug_printf_indent("retry for %s (%s) = %s %d %d\n", rti->key,
               addr->domain, retry->pattern, retry->basic_errno,
               retry->more_errno);
           else
-            debug_printf("retry for %s = %s %d %d\n", rti->key, retry->pattern,
+            debug_printf_indent("retry for %s = %s %d %d\n", rti->key, retry->pattern,
               retry->basic_errno, retry->more_errno);
 
         /* Set up the message for the database retry record. Because DBM
@@ -711,7 +710,7 @@ for (int i = 0; i < 3; i++)
         /* Compute how long this destination has been failing */
 
         failing_interval = now - retry_record->first_failed;
-        DEBUG(D_retry) debug_printf("failing_interval=%d message_age=%d\n",
+        DEBUG(D_retry) debug_printf_indent("failing_interval=%d message_age=%d\n",
           failing_interval, message_age);
 
         /* For a non-host error, if the message has been on the queue longer
@@ -793,7 +792,7 @@ for (int i = 0; i < 3; i++)
         ;
           if (now - received_time.tv_sec > last_rule->timeout)
             {
-            DEBUG(D_retry) debug_printf("on queue longer than maximum retry\n");
+            DEBUG(D_retry) debug_printf_indent("on queue longer than maximum retry\n");
             timedout_count++;
             rule = NULL;
             }
@@ -862,11 +861,11 @@ for (int i = 0; i < 3; i++)
         DEBUG(D_retry)
           {
           int letter = retry_record->more_errno & 255;
-          debug_printf("Writing retry data for %s\n", rti->key);
-          debug_printf("  first failed=%d last try=%d next try=%d expired=%d\n",
+          debug_printf_indent("Writing retry data for %s\n", rti->key);
+          debug_printf_indent("  first failed=%d last try=%d next try=%d expired=%d\n",
             (int)retry_record->first_failed, (int)retry_record->last_try,
             (int)retry_record->next_try, retry_record->expired);
-          debug_printf("  errno=%d more_errno=", retry_record->basic_errno);
+          debug_printf_indent("  errno=%d more_errno=", retry_record->basic_errno);
           if (letter == 'A' || letter == 'M')
             debug_printf("%d,%c", (retry_record->more_errno >> 8) & 255,
               letter);
@@ -886,12 +885,12 @@ for (int i = 0; i < 3; i++)
       if (update_count > 0 && update_count == timedout_count)
         if (!testflag(endaddr, af_retry_skipped))
           {
-          DEBUG(D_retry) debug_printf("timed out: all retries expired\n");
+          DEBUG(D_retry) debug_printf_indent("timed out: all retries expired\n");
           timed_out = TRUE;
           }
         else
           DEBUG(D_retry)
-            debug_printf("timed out but some hosts were skipped\n");
+            debug_printf_indent("timed out but some hosts were skipped\n");
       }     /* Loop for an address and its parents */
 
     /* If this is a deferred address, and retry processing was requested by
@@ -958,7 +957,7 @@ for (int i = 0; i < 3; i++)
 
 if (dbm_file) dbfn_close(dbm_file);
 
-DEBUG(D_retry) debug_printf("end of retry processing\n");
+DEBUG(D_retry) { acl_level--; debug_printf("end of retry processing\n"); }
 }
 
 /* End of retry.c */
diff --git a/test/runtest b/test/runtest
index d205f9509..7a642fc20 100755
--- a/test/runtest
+++ b/test/runtest
@@ -575,10 +575,10 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/\d\d-\w\w\w-\d\d\d\d\s\d\d:\d\d:\d\d\s[-+]\d\d\d\d,/06-Sep-1999 15:52:48 +0100,/gx;
 
   # Dates/times in debugging output for writing retry records
-  if (/^  first failed=(\d+) last try=(\d+) next try=(\d+) (.*)$/)
+  if (/^(\s+)first failed=(\d+) last try=(\d+) next try=(\d+) (.*)$/)
     {
-    my($next) = $3 - $2;
-    $_ = "  first failed=dddd last try=dddd next try=+$next $4\n";
+    my($next) = $4 - $3;
+    $_ = "$1first failed=dddd last try=dddd next try=+$next $5\n";
     }
   s/^(\s*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\w)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/;
   s/^(\s*)received_time=\d+ diff=\d+ timeout=(\d+)/$1received_time=tttt diff=tttt timeout=$2/;
diff --git a/test/stderr/0264 b/test/stderr/0264
index f44b1e97f..e2876c3eb 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -83,19 +83,19 @@ After routing:
     rz.b@outside

>>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>

Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- rz.b@outside
-*@outside in "^\*@r5domain.ex"? no (end of list)
-*@outside in "userx@???"? no (end of list)
-outside in "test.ex"? no (end of list)
-*@outside in "test.ex"? no (end of list)
-retry for R:outside = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:outside
- first failed=dddd last try=dddd next try=+300 expired=0
- errno=-1 more_errno=dd not just now
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+ rz.b@outside
+ *@outside in "^\*@r5domain.ex"? no (end of list)
+ *@outside in "userx@???"? no (end of list)
+ outside in "test.ex"? no (end of list)
+ *@outside in "test.ex"? no (end of list)
+ retry for R:outside = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:outside
+ first failed=dddd last try=dddd next try=+300 expired=0
+ errno=-1 more_errno=dd not just now
end of retry processing
time on queue = 0s id 10HmbJ-000000005vi-0000 addr rz.b@outside
warning counts: required 0 done 0
diff --git a/test/stderr/0275 b/test/stderr/0275
index 7016b5974..8015006e0 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -487,10 +487,10 @@ changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=p1236
set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
Processing retry items
-Succeeded addresses:
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+ userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
end of retry processing
DSN: processing router : r3
DSN: processing successful delivery address: userx@???
diff --git a/test/stderr/0278 b/test/stderr/0278
index 1910c262e..e0a55a4d8 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -287,10 +287,10 @@ changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=p1236
set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
Processing retry items
-Succeeded addresses:
- CALLER@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+ CALLER@???: no retry items
+ Failed addresses:
+ Deferred addresses:
end of retry processing
DSN: processing router : r3
DSN: processing successful delivery address: CALLER@???
diff --git a/test/stderr/0357 b/test/stderr/0357
index cde038b41..2bb5a7fc9 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -33,15 +33,15 @@ reading retry information for R:userx@???:<CALLER@???> from subprocess
LOG: MAIN
== userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@???
-retry for R:userx@???:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:userx@???:<CALLER@???>
- first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+ userx@???
+ retry for R:userx@???:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:userx@???:<CALLER@???>
+ first failed=dddd last try=dddd next try=+2 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -86,17 +86,17 @@ reading retry information for R:userx@???:<CALLER@???> from subprocess
LOG: MAIN
== userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@???
-deleted retry information for R:userx@???
-deleted retry information for R:test.ex
-retry for R:userx@???:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:userx@???:<CALLER@???>
- first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+ userx@???
+ deleted retry information for R:userx@???
+ deleted retry information for R:test.ex
+ retry for R:userx@???:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:userx@???:<CALLER@???>
+ first failed=dddd last try=dddd next try=+2 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

LOG: queue_run MAIN
@@ -143,17 +143,17 @@ reading retry information for R:userx@???:<CALLER@???> from subprocess
LOG: MAIN
== userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@???
-deleted retry information for R:userx@???
-deleted retry information for R:test.ex
-retry for R:userx@???:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:userx@???:<CALLER@???>
- first failed=dddd last try=dddd next try=+4 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+ userx@???
+ deleted retry information for R:userx@???
+ deleted retry information for R:test.ex
+ retry for R:userx@???:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:userx@???:<CALLER@???>
+ first failed=dddd last try=dddd next try=+4 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=p1243 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
@@ -183,10 +183,10 @@ After routing:
   Deferred addresses:
     userx@???
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@???: no retry items
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  userx@???: no retry items
 end of retry processing

>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

LOG: queue_run MAIN
diff --git a/test/stderr/0358 b/test/stderr/0358
index f7cfee1f8..e2e392095 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -43,21 +43,21 @@ LOG: MAIN
LOG: MAIN
== usery@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- usery@???
-retry for R:usery@???:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:usery@???:<CALLER@???>
- first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
- userx@???
-retry for R:userx@???:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:userx@???:<CALLER@???>
- first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+ usery@???
+ retry for R:usery@???:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:usery@???:<CALLER@???>
+ first failed=dddd last try=dddd next try=+2 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
+ userx@???
+ retry for R:userx@???:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:userx@???:<CALLER@???>
+ first failed=dddd last try=dddd next try=+2 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -124,25 +124,25 @@ LOG: MAIN
LOG: MAIN
== usery@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- usery@???
-deleted retry information for R:usery@???
-deleted retry information for R:test.ex
-retry for R:usery@???:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:usery@???:<CALLER@???>
- first failed=dddd last try=dddd next try=+4 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
- userx@???
-deleted retry information for R:userx@???
-deleted retry information for R:test.ex
-retry for R:userx@???:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:userx@???:<CALLER@???>
- first failed=dddd last try=dddd next try=+4 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+ usery@???
+ deleted retry information for R:usery@???
+ deleted retry information for R:test.ex
+ retry for R:usery@???:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:usery@???:<CALLER@???>
+ first failed=dddd last try=dddd next try=+4 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
+ userx@???
+ deleted retry information for R:userx@???
+ deleted retry information for R:test.ex
+ retry for R:userx@???:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:userx@???:<CALLER@???>
+ first failed=dddd last try=dddd next try=+4 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
diff --git a/test/stderr/0386 b/test/stderr/0386
index bb322c8a4..0e303d860 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -387,10 +387,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1236
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- 2@b: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  2@b: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: 2@b
@@ -582,10 +582,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1238
 set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- 2@b: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  2@b: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: 2@b
diff --git a/test/stderr/0388 b/test/stderr/0388
index 78be65faf..cd2772feb 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -146,49 +146,49 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1234
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- x@y
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- x@y in "*"?
-  list element: *
-  address match test: subject=x@y pattern=*
-  y in "*"?
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  x@y
+  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
+  returned from EXIM_DBOPEN: 0xAAAAAAAA
+  opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
+  x@y in "*"?
    list element: *
-   y in "*"? yes (matched "*")
-  x@y in "*"? yes (matched "*")
-retry for R:x@y = * 0 0
- dbfn_read: key=R:x@y
- dbfn_read: null return
-failing_interval=ttt message_age=ttt
-Writing retry data for R:x@y
-  first failed=dddd last try=dddd next try=+1 expired=1
-  errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
- dbfn_write: key=R:x@y datalen 148
- *@V4NET.0.0.0 in "*"?
-  list element: *
-  address match test: subject=*@V4NET.0.0.0 pattern=*
-  V4NET.0.0.0 in "*"?
+   address match test: subject=x@y pattern=*
+   y in "*"?
+   ╎list element: *
+   ╎y in "*"? yes (matched "*")
+   x@y in "*"? yes (matched "*")
+  retry for R:x@y = * 0 0
+  dbfn_read: key=R:x@y
+  dbfn_read: null return
+  failing_interval=ttt message_age=ttt
+  Writing retry data for R:x@y
+    first failed=dddd last try=dddd next try=+1 expired=1
+    errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
+  dbfn_write: key=R:x@y datalen 148
+  *@V4NET.0.0.0 in "*"?
    list element: *
-   V4NET.0.0.0 in "*"? yes (matched "*")
-  *@V4NET.0.0.0 in "*"? yes (matched "*")
-retry for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S (y) = * 0 0
- dbfn_read: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S
- dbfn_read: null return
-failing_interval=ttt message_age=ttt
-on queue longer than maximum retry
-Writing retry data for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S
-  first failed=dddd last try=dddd next try=+0 expired=0
-  errno=dd more_errno=dd,A Network Error
- dbfn_write: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S datalen 70
-timed out: all retries expired
+   address match test: subject=*@V4NET.0.0.0 pattern=*
+   V4NET.0.0.0 in "*"?
+   ╎list element: *
+   ╎V4NET.0.0.0 in "*"? yes (matched "*")
+   *@V4NET.0.0.0 in "*"? yes (matched "*")
+  retry for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S (y) = * 0 0
+  dbfn_read: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S
+  dbfn_read: null return
+  failing_interval=ttt message_age=ttt
+  on queue longer than maximum retry
+  Writing retry data for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S
+    first failed=dddd last try=dddd next try=+0 expired=0
+    errno=dd more_errno=dd,A Network Error
+  dbfn_write: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S datalen 70
+  timed out: all retries expired
 LOG: MAIN
   ** x@y: retry timeout exceeded
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
+  EXIM_DBCLOSE(0xAAAAAAAA)
+  closed hints database
 end of retry processing
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-000000005vi-0000
 Exim version x.yz ....
@@ -311,10 +311,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1237
 set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- CALLER@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  CALLER@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 LOG: MAIN
   Completed
diff --git a/test/stderr/0402 b/test/stderr/0402
index e92ec9019..bac58e5f2 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -1057,18 +1057,18 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userz@???: no retry items
- usery@???: no retry items
- CALLER@???: no retry items
- TESTSUITE/test-mail/junk: no retry items
- rd+CALLER@???: no retry items
- TESTSUITE/test-mail/junk: no retry items
- rd+usery@???: no retry items
- rd+CALLER@???: no retry items
- rd+usery@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userz@???: no retry items
+  usery@???: no retry items
+  CALLER@???: no retry items
+  TESTSUITE/test-mail/junk: no retry items
+  rd+CALLER@???: no retry items
+  TESTSUITE/test-mail/junk: no retry items
+  rd+usery@???: no retry items
+  rd+CALLER@???: no retry items
+  rd+usery@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r3
 DSN: processing successful delivery address: userz@???
diff --git a/test/stderr/0404 b/test/stderr/0404
index 699106f7b..c553daf88 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -18624,10 +18624,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1239
 set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- sender@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  sender@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: sender@???
@@ -18660,12 +18660,12 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...: no retry items
- userx@???: no retry items
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...: no retry items
+  userx@???: no retry items
+  userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r2
 DSN: processing successful delivery address: >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
diff --git a/test/stderr/0408 b/test/stderr/0408
index 09ad23207..99388a95b 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -179,10 +179,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@???
diff --git a/test/stderr/0487 b/test/stderr/0487
index cb058603d..f86b9e3d8 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -183,10 +183,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@???
diff --git a/test/stderr/0529 b/test/stderr/0529
index 3ef6a56dc..aeecbe615 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -32,17 +32,17 @@ added retry item for T:TESTSUITE/test-mail/rmbox:x@???: errno=-22 more_errno
 LOG: MAIN
   == TESTSUITE/test-mail/rmbox <x@???> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
 Processing retry items
-Succeeded addresses:
- x@???: no retry items
-Failed addresses:
-Deferred addresses:
- TESTSUITE/test-mail/rmbox
-retry for T:TESTSUITE/test-mail/rmbox:x@??? = *@test.ex -22 0
-failing_interval=ttt message_age=ttt
-Writing retry data for T:TESTSUITE/test-mail/rmbox:x@???
-  first failed=dddd last try=dddd next try=+900 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
- x@???: no retry items
+ Succeeded addresses:
+  x@???: no retry items
+ Failed addresses:
+ Deferred addresses:
+  TESTSUITE/test-mail/rmbox
+ retry for T:TESTSUITE/test-mail/rmbox:x@??? = *@test.ex -22 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for T:TESTSUITE/test-mail/rmbox:x@???
+   first failed=dddd last try=dddd next try=+900 expired=0
+   errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
+  x@???: no retry items
 end of retry processing

>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -74,12 +74,12 @@ retry time not reached: checking ultimate address timeout
LOG: retry_defer MAIN
== TESTSUITE/test-mail/rmbox <x@???> R=r1 T=t1 defer (-53): Retry time not yet reached
Processing retry items
-Succeeded addresses:
- x@???: no retry items
-Failed addresses:
-Deferred addresses:
- TESTSUITE/test-mail/rmbox: no retry items
- x@???: no retry items
+ Succeeded addresses:
+ x@???: no retry items
+ Failed addresses:
+ Deferred addresses:
+ TESTSUITE/test-mail/rmbox: no retry items
+ x@???: no retry items
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

LOG: queue_run MAIN
diff --git a/test/stderr/0554 b/test/stderr/0554
index 25bba511d..4f87801df 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -25,15 +25,15 @@ reading retry information for R:x@y:<CALLER@???> from subprocess
LOG: MAIN
== x@y R=r1 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- x@y
-retry for R:x@y:<CALLER@???> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:x@y:<CALLER@???>
- first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+ x@y
+ retry for R:x@y:<CALLER@???> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:x@y:<CALLER@???>
+ first failed=dddd last try=dddd next try=+2 expired=0
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
@@ -80,13 +80,13 @@ reading retry information for R:x@y:<CALLER@???> from subprocess
 LOG: MAIN
   => x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 Processing retry items
-Succeeded addresses:
- x@y
-deleted retry information for R:x@y:<CALLER@???>
-deleted retry information for R:x@y
-deleted retry information for R:y
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  x@y
+ deleted retry information for R:x@y:<CALLER@???>
+ deleted retry information for R:x@y
+ deleted retry information for R:y
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 LOG: MAIN
   Completed
diff --git a/test/stderr/2600 b/test/stderr/2600
index 8bfaf1c92..5b8d97e38 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -681,10 +681,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1239
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@???
diff --git a/test/stderr/2610 b/test/stderr/2610
index e0326a6a7..950d09229 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -930,10 +930,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1237
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- ph10@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  ph10@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: ph10@???
diff --git a/test/stderr/2620 b/test/stderr/2620
index 6446d6912..44aca59eb 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -826,10 +826,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1238
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- CALLER@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  CALLER@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: CALLER@???
diff --git a/test/stderr/5004 b/test/stderr/5004
index 6ab926c43..dd78e2352 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -170,12 +170,12 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- TESTSUITE/test-mail: no retry items
- userx@???: no retry items
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  TESTSUITE/test-mail: no retry items
+  userx@???: no retry items
+  userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: TESTSUITE/test-mail
diff --git a/test/stderr/5005 b/test/stderr/5005
index 6620345bf..879ec0ed9 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -167,10 +167,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- nofile@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  nofile@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: nofile@???
@@ -358,10 +358,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1238
 set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@???
@@ -543,30 +543,30 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1241
 set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@???
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- userx@??? in "*"?
-  list element: *
-  address match test: subject=userx@??? pattern=*
-  test.ex in "*"?
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  userx@???
+  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
+  returned from EXIM_DBOPEN: 0xAAAAAAAA
+  opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
+  userx@??? in "*"?
    list element: *
-   test.ex in "*"? yes (matched "*")
-  userx@??? in "*"? yes (matched "*")
-retry for T:userx@??? = * 0 0
- dbfn_read: key=T:userx@???
- dbfn_read: null return
-failing_interval=ttt message_age=ttt
-Writing retry data for T:userx@???
-  first failed=dddd last try=dddd next try=+86400 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
- dbfn_write: key=T:userx@??? datalen 154
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
+   address match test: subject=userx@??? pattern=*
+   test.ex in "*"?
+   ╎list element: *
+   ╎test.ex in "*"? yes (matched "*")
+   userx@??? in "*"? yes (matched "*")
+  retry for T:userx@??? = * 0 0
+  dbfn_read: key=T:userx@???
+  dbfn_read: null return
+  failing_interval=ttt message_age=ttt
+  Writing retry data for T:userx@???
+    first failed=dddd last try=dddd next try=+86400 expired=0
+    errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
+  dbfn_write: key=T:userx@??? datalen 154
+  EXIM_DBCLOSE(0xAAAAAAAA)
+  closed hints database
 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000
@@ -742,30 +742,30 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1244
 set_process_info: pppp tidying up after delivering 10HmbA-000000005vi-0000
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@???
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- userx@??? in "*"?
-  list element: *
-  address match test: subject=userx@??? pattern=*
-  test.ex in "*"?
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  userx@???
+  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
+  returned from EXIM_DBOPEN: 0xAAAAAAAA
+  opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
+  userx@??? in "*"?
    list element: *
-   test.ex in "*"? yes (matched "*")
-  userx@??? in "*"? yes (matched "*")
-retry for T:userx@??? = * 0 0
- dbfn_read: key=T:userx@???
- dbfn_read: size 154 return
-failing_interval=ttt message_age=ttt
-Writing retry data for T:userx@???
-  first failed=dddd last try=dddd next try=+86400 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
- dbfn_write: key=T:userx@??? datalen 154
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
+   address match test: subject=userx@??? pattern=*
+   test.ex in "*"?
+   ╎list element: *
+   ╎test.ex in "*"? yes (matched "*")
+   userx@??? in "*"? yes (matched "*")
+  retry for T:userx@??? = * 0 0
+  dbfn_read: key=T:userx@???
+  dbfn_read: size 154 return
+  failing_interval=ttt message_age=ttt
+  Writing retry data for T:userx@???
+    first failed=dddd last try=dddd next try=+86400 expired=0
+    errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
+  dbfn_write: key=T:userx@??? datalen 154
+  EXIM_DBCLOSE(0xAAAAAAAA)
+  closed hints database
 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000
diff --git a/test/stderr/5006 b/test/stderr/5006
index 01e2ee923..5d9c35fcd 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -165,10 +165,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userx@???: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@???: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@???


--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/