From 4be05500e605ccc0a68f1d3704c12ffd03cf2dfb Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 5 Oct 2012 00:17:10 +1000 Subject: [PATCH] rfc822: Rename RFC822_HDR_BAD_NAME constant This error constant is actually more specific than the name suggests - it indicates that a header field name contains characters which are not permitted in a header field name. Rename the constant to better reflect this, likewise rename the testcase based around it. Signed-off-by: David Gibson --- ccan/rfc822/rfc822.c | 2 +- ccan/rfc822/rfc822.h | 2 +- .../{run-bad-header-name.c => run-bad-header-name-chars.c} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename ccan/rfc822/test/{run-bad-header-name.c => run-bad-header-name-chars.c} (95%) diff --git a/ccan/rfc822/rfc822.c b/ccan/rfc822/rfc822.c index 4a5e4ccd..6a0f95fc 100644 --- a/ccan/rfc822/rfc822.c +++ b/ccan/rfc822/rfc822.c @@ -257,7 +257,7 @@ enum rfc822_header_errors rfc822_header_errors(struct rfc822_msg *msg, assert(c != ':'); if ((c < 33) || (c > 126)) { - err |= RFC822_HDR_BAD_NAME; + err |= RFC822_HDR_BAD_NAME_CHARS; break; } } diff --git a/ccan/rfc822/rfc822.h b/ccan/rfc822/rfc822.h index 2beae410..1170c113 100644 --- a/ccan/rfc822/rfc822.h +++ b/ccan/rfc822/rfc822.h @@ -117,7 +117,7 @@ struct bytestring rfc822_body(struct rfc822_msg *msg); enum rfc822_header_errors { RFC822_HDR_NO_COLON = 1, - RFC822_HDR_BAD_NAME = 2, + RFC822_HDR_BAD_NAME_CHARS = 2, }; enum rfc822_header_errors rfc822_header_errors(struct rfc822_msg *msg, diff --git a/ccan/rfc822/test/run-bad-header-name.c b/ccan/rfc822/test/run-bad-header-name-chars.c similarity index 95% rename from ccan/rfc822/test/run-bad-header-name.c rename to ccan/rfc822/test/run-bad-header-name-chars.c index 7b4eac19..532f3078 100644 --- a/ccan/rfc822/test/run-bad-header-name.c +++ b/ccan/rfc822/test/run-bad-header-name-chars.c @@ -40,7 +40,7 @@ static bool bad_name(const char *buf, char c) allocation_failure_check(); - ok1(!(errs & ~RFC822_HDR_BAD_NAME)); + ok1(!(errs & ~RFC822_HDR_BAD_NAME_CHARS)); /* Check raw_name still works properly */ hname = rfc822_header_raw_name(msg, hdr); @@ -55,7 +55,7 @@ static bool bad_name(const char *buf, char c) allocation_failure_check(); - return !!(errs & RFC822_HDR_BAD_NAME); + return !!(errs & RFC822_HDR_BAD_NAME_CHARS); } int main(int argc, char *argv[]) -- 2.39.2