From: Willy Tarreau <w@1wt.eu>
Date: Wed, 6 Jan 2016 19:45:03 +0000 (+0100)
Subject: MINOR: chunk: make chunk_initstr() take a const string
X-Git-Tag: v1.7-dev2~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70af633ebe8627fdf6b448f96c0e457adc93b1d1;p=thirdparty%2Fhaproxy.git

MINOR: chunk: make chunk_initstr() take a const string

chunk_initstr() prepares a read-only chunk from a string of
fixed length. Thus it must be prepared to accept a read-only
string on the input, otherwise the caller has to force-cast
some const char* and that's not a good idea.
---

diff --git a/include/common/chunk.h b/include/common/chunk.h
index 35bf219da2..851c7a65e2 100644
--- a/include/common/chunk.h
+++ b/include/common/chunk.h
@@ -77,9 +77,10 @@ static inline int chunk_initlen(struct chunk *chk, char *str, size_t size, int l
 	return 1;
 }
 
-static inline void chunk_initstr(struct chunk *chk, char *str)
+/* this is only for temporary manipulation, the chunk is read-only */
+static inline void chunk_initstr(struct chunk *chk, const char *str)
 {
-	chk->str = str;
+	chk->str = (char *)str;
 	chk->len = strlen(str);
 	chk->size = 0;			/* mark it read-only */
 }