From f41548c1cf77b78f7fa571105b3ae8abd036bb58 Mon Sep 17 00:00:00 2001
From: Joe Orton <joe@manyfish.uk>
Date: Wed, 24 Apr 2024 19:23:00 +0100
Subject: [PATCH] * src/basic.c (mkcol_with_body, mkcol_again): Update error
 messages   from RFC 2518 to 4918; no functional change.

---
 src/basic.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/basic.c b/src/basic.c
index 6b35e2a..50f4625 100644
--- a/src/basic.c
+++ b/src/basic.c
@@ -306,12 +306,13 @@ static int mkcol_again(void)
 {
     PRECOND(coll_uri);
 
-    ONN("MKCOL on existing collection should fail (RFC2518:8.3.1)",
-	ne_mkcol(i_session, coll_uri) != NE_ERROR);
+    ONV(ne_mkcol(i_session, coll_uri) != NE_ERROR,
+        ("MKCOL on existing collection should fail (RFC4918:S9.1), got: %s",
+         ne_get_error(i_session)));
 
     if (STATUS(405)) {
-	t_warning("MKCOL on existing collection gave %d, should be 405 (RFC2518:8.3.2)",
-		  GETSTATUS);
+	t_warning("MKCOL on existing collection gave %d, should be "
+                  "405 (RFC4918:S9.3.2)", GETSTATUS);
     }
     
     return OK;
@@ -364,12 +365,10 @@ static int mkcol_with_body(void)
     ONV(ne_request_dispatch(req),
 	("MKCOL on `%s' with (invalid) body: %s", uri,
 	 ne_get_error(i_session)));
-    
-    ONN("MKCOL with weird body must fail (RFC2518:8.3.1)",
-	ne_get_status(req)->klass == 2);
-    
-    ONN("MKCOL with weird body must fail with 415 (RFC2518:8.3.1)",
-	ne_get_status(req)->code != 415);
+
+    ONV(ne_get_status(req)->code != 415,
+        ("MKCOL with weird body must fail, got %d [RFC4918:S9.3)",
+         ne_get_status(req)->code));
     
     ne_request_destroy(req);