[libmicrohttpd] 02/04: mhd_str: renamed internal struct

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit c15077e312ffe934b242c7ecc6559c6eb4eb62cb
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Sat May 28 19:17:15 2022 +0300

    mhd_str: renamed internal struct
---
 src/microhttpd/mhd_str.h       |  7 +++++--
 src/microhttpd/reason_phrase.c | 14 +++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/microhttpd/mhd_str.h b/src/microhttpd/mhd_str.h
index 82d2d606..d86e0dc7 100644
--- a/src/microhttpd/mhd_str.h
+++ b/src/microhttpd/mhd_str.h
@@ -54,9 +54,12 @@ typedef intptr_t ssize_t;
 #define MHD_STATICSTR_LEN_(macro) (sizeof(macro) / sizeof(char) - 1)
 #endif /* ! MHD_STATICSTR_LEN_ */
 
-struct _MHD_str_w_len
+/**
+ * Constant string with length
+ */
+struct _MHD_cstr_w_len
 {
-  const char *str;
+  const char *const str;
   const size_t len;
 };
 
diff --git a/src/microhttpd/reason_phrase.c b/src/microhttpd/reason_phrase.c
index 5ccc44b4..ec5d6fc0 100644
--- a/src/microhttpd/reason_phrase.c
+++ b/src/microhttpd/reason_phrase.c
@@ -32,18 +32,18 @@
 #define NULL ((void*) 0)
 #endif
 
-static const struct _MHD_str_w_len invalid_hundred[] = {
+static const struct _MHD_cstr_w_len invalid_hundred[] = {
   { NULL, 0 }
 };
 
-static const struct _MHD_str_w_len one_hundred[] = {
+static const struct _MHD_cstr_w_len one_hundred[] = {
   /* 100 */ _MHD_S_STR_W_LEN ("Continue"),       /* 
RFC-ietf-httpbis-semantics, Section 15.2.1 */
   /* 101 */ _MHD_S_STR_W_LEN ("Switching Protocols"), /* 
RFC-ietf-httpbis-semantics, Section 15.2.2 */
   /* 102 */ _MHD_S_STR_W_LEN ("Processing"),     /* RFC2518 */
   /* 103 */ _MHD_S_STR_W_LEN ("Early Hints")     /* RFC8297 */
 };
 
-static const struct _MHD_str_w_len two_hundred[] = {
+static const struct _MHD_cstr_w_len two_hundred[] = {
   /* 200 */ _MHD_S_STR_W_LEN ("OK"),             /* 
RFC-ietf-httpbis-semantics, Section 15.3.1 */
   /* 201 */ _MHD_S_STR_W_LEN ("Created"),        /* 
RFC-ietf-httpbis-semantics, Section 15.3.2 */
   /* 202 */ _MHD_S_STR_W_LEN ("Accepted"),       /* 
RFC-ietf-httpbis-semantics, Section 15.3.3 */
@@ -73,7 +73,7 @@ static const struct _MHD_str_w_len two_hundred[] = {
   /* 226 */ _MHD_S_STR_W_LEN ("IM Used")         /* RFC3229 */
 };
 
-static const struct _MHD_str_w_len three_hundred[] = {
+static const struct _MHD_cstr_w_len three_hundred[] = {
   /* 300 */ _MHD_S_STR_W_LEN ("Multiple Choices"), /* 
RFC-ietf-httpbis-semantics, Section 15.4.1 */
   /* 301 */ _MHD_S_STR_W_LEN ("Moved Permanently"), /* 
RFC-ietf-httpbis-semantics, Section 15.4.2 */
   /* 302 */ _MHD_S_STR_W_LEN ("Found"),          /* 
RFC-ietf-httpbis-semantics, Section 15.4.3 */
@@ -85,7 +85,7 @@ static const struct _MHD_str_w_len three_hundred[] = {
   /* 308 */ _MHD_S_STR_W_LEN ("Permanent Redirect") /* 
RFC-ietf-httpbis-semantics, Section 15.4.9 */
 };
 
-static const struct _MHD_str_w_len four_hundred[] = {
+static const struct _MHD_cstr_w_len four_hundred[] = {
   /* 400 */ _MHD_S_STR_W_LEN ("Bad Request"),    /* 
RFC-ietf-httpbis-semantics, Section 15.5.1 */
   /* 401 */ _MHD_S_STR_W_LEN ("Unauthorized"),   /* 
RFC-ietf-httpbis-semantics, Section 15.5.2 */
   /* 402 */ _MHD_S_STR_W_LEN ("Payment Required"), /* 
RFC-ietf-httpbis-semantics, Section 15.5.3 */
@@ -140,7 +140,7 @@ static const struct _MHD_str_w_len four_hundred[] = {
   /* 451 */ _MHD_S_STR_W_LEN ("Unavailable For Legal Reasons") /* RFC7725 */
 };
 
-static const struct _MHD_str_w_len five_hundred[] = {
+static const struct _MHD_cstr_w_len five_hundred[] = {
   /* 500 */ _MHD_S_STR_W_LEN ("Internal Server Error"), /* 
RFC-ietf-httpbis-semantics, Section 15.6.1 */
   /* 501 */ _MHD_S_STR_W_LEN ("Not Implemented"), /* 
RFC-ietf-httpbis-semantics, Section 15.6.2 */
   /* 502 */ _MHD_S_STR_W_LEN ("Bad Gateway"),    /* 
RFC-ietf-httpbis-semantics, Section 15.6.3 */
@@ -159,7 +159,7 @@ static const struct _MHD_str_w_len five_hundred[] = {
 struct MHD_Reason_Block
 {
   size_t max;
-  const struct _MHD_str_w_len *const data;
+  const struct _MHD_cstr_w_len *const data;
 };
 
 #define BLOCK(m) { (sizeof(m) / sizeof(m[0])), m }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.