From 343266f471bd331e5d7df4049ded973d98b14b71 Mon Sep 17 00:00:00 2001
From: bot <a@b.c>
Date: Mon, 1 Jun 2026 10:20:47 +0000
Subject: [PATCH] log: normalize AFP deleted-info messages

---
 src/nwconn.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/nwconn.c b/src/nwconn.c
index 3679796..b6d8a32 100644
--- a/src/nwconn.c
+++ b/src/nwconn.c
@@ -2031,7 +2031,7 @@ static int afp_get_macintosh_info_on_deleted_file(uint8 *afp_req, int afp_len,
   int result;
 
   if (afp_len < 6) {
-    XDPRINTF((2,0, "AFP Get Macintosh Info On Deleted File rejected: short request len=%d",
+    XDPRINTF((2,0, "WARN AFP 35/19 REJECT reason=short_request len=%d fn=0x23 sub=0x13 result=0x7e",
               afp_len));
     return(-0x7e); /* NCP Boundary Check Failed */
   }
@@ -2040,7 +2040,7 @@ static int afp_get_macintosh_info_on_deleted_file(uint8 *afp_req, int afp_len,
   dos_directory_number = GET_BE32(afp_req + 2);
 
   if (!nwatalk_backend_available()) {
-    XDPRINTF((3,0, "AFP Get Macintosh Info On Deleted File rejected: AFP xattr metadata backend unavailable"));
+    XDPRINTF((3,0, "WARN AFP 35/19 REJECT reason=xattr_backend_unavailable fn=0x23 sub=0x13 result=0xbf"));
     return(-0xbf); /* invalid namespace */
   }
 
@@ -2049,13 +2049,15 @@ static int afp_get_macintosh_info_on_deleted_file(uint8 *afp_req, int afp_len,
                                                       (unsigned long)dos_directory_number,
                                                       &scan);
   if (result < 0) {
-    XDPRINTF((2,0, "AFP Get Macintosh Info On Deleted File scan failed: vol=%d dosdir=0x%08x errno=%d",
-              (int)volume_number, (unsigned int)dos_directory_number, errno));
+    XDPRINTF((2,0, "WARN AFP 35/19 FAIL vol=%u dosdir=%lu errno=%d fn=0x23 sub=0x13 dosdir_hex=0x%08x result=0x9c",
+              (unsigned int)volume_number, (unsigned long)dos_directory_number,
+              errno, (unsigned int)dos_directory_number));
     return(-0x9c); /* Invalid Path */
   }
   if (result == 0) {
-    XDPRINTF((2,0, "AFP Get Macintosh Info On Deleted File not found: vol=%d dosdir=0x%08x",
-              (int)volume_number, (unsigned int)dos_directory_number));
+    XDPRINTF((2,0, "INFO AFP 35/19 NOTFOUND vol=%u dosdir=%lu fn=0x23 sub=0x13 dosdir_hex=0x%08x result=0x9c",
+              (unsigned int)volume_number, (unsigned long)dos_directory_number,
+              (unsigned int)dos_directory_number));
     return(-0x9c); /* Invalid Path */
   }
 
@@ -2076,9 +2078,11 @@ static int afp_get_macintosh_info_on_deleted_file(uint8 *afp_req, int afp_len,
   memcpy(response + 43, name, name_len);
 
   XDPRINTF((3, 0,
-            "INFO AFP 35/19 DONE fn=0x23 sub=0x13 vol=0x%02x dosdir=0x%08x name=\"%s\" resource=0x%08lx prodos=%02x%02x%02x%02x%02x%02x",
-            (unsigned int)volume_number, (unsigned int)dos_directory_number,
+            "INFO AFP 35/19 DONE vol=%u dosdir=%lu name=\"%s\" resource=%lu fn=0x23 sub=0x13 dosdir_hex=0x%08x resource_hex=0x%08lx prodos=%02x%02x%02x%02x%02x%02x",
+            (unsigned int)volume_number, (unsigned long)dos_directory_number,
             name, (unsigned long)scan.metadata.resource_fork_size,
+            (unsigned int)dos_directory_number,
+            (unsigned long)scan.metadata.resource_fork_size,
             prodos_info[0], prodos_info[1], prodos_info[2],
             prodos_info[3], prodos_info[4], prodos_info[5]));
   return(43 + name_len);