From 8de1df92a3d6413dcd4796c954dba8bf8589833b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 15 Apr 2019 21:27:18 +0200 Subject: [PATCH] BUILD: do not specify "const" on functions returning structs or scalars Older compilers (like gcc-3.4) warn about the use of "const" on functions returning a struct, which makes sense since the return may only be copied : include/common/htx.h:233: warning: type qualifiers ignored on function return type Let's simply drop "const" here. --- include/common/http.h | 2 +- include/common/htx.h | 18 +++++++++--------- src/http.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/common/http.h b/include/common/http.h index 2f7486ea4..b0befa5f1 100644 --- a/include/common/http.h +++ b/include/common/http.h @@ -136,7 +136,7 @@ extern const char *HTTP_407_fmt; int init_http(char **err); enum http_meth_t find_http_meth(const char *str, const int len); -const int http_get_status_idx(unsigned int status); +int http_get_status_idx(unsigned int status); const char *http_get_reason(unsigned int status); struct ist http_get_path(const struct ist uri); int http_header_match2(const char *hdr, const char *end, diff --git a/include/common/htx.h b/include/common/htx.h index 8d639a301..9cbc95300 100644 --- a/include/common/htx.h +++ b/include/common/htx.h @@ -229,48 +229,48 @@ int htx_trailer_to_h1(const struct ist tlr, struct buffer *chk); #define HTX_SL_RES_CPTR(sl) HTX_SL_P2_PTR(sl) #define HTX_SL_RES_RPTR(sl) HTX_SL_P3_PTR(sl) -static inline const struct ist htx_sl_p1(const struct htx_sl *sl) +static inline struct ist htx_sl_p1(const struct htx_sl *sl) { return ist2(HTX_SL_P1_PTR(sl), HTX_SL_P1_LEN(sl)); } -static inline const struct ist htx_sl_p2(const struct htx_sl *sl) +static inline struct ist htx_sl_p2(const struct htx_sl *sl) { return ist2(HTX_SL_P2_PTR(sl), HTX_SL_P2_LEN(sl)); } -static inline const struct ist htx_sl_p3(const struct htx_sl *sl) +static inline struct ist htx_sl_p3(const struct htx_sl *sl) { return ist2(HTX_SL_P3_PTR(sl), HTX_SL_P3_LEN(sl)); } -static inline const struct ist htx_sl_req_meth(const struct htx_sl *sl) +static inline struct ist htx_sl_req_meth(const struct htx_sl *sl) { return htx_sl_p1(sl); } -static inline const struct ist htx_sl_req_uri(const struct htx_sl *sl) +static inline struct ist htx_sl_req_uri(const struct htx_sl *sl) { return htx_sl_p2(sl); } -static inline const struct ist htx_sl_req_vsn(const struct htx_sl *sl) +static inline struct ist htx_sl_req_vsn(const struct htx_sl *sl) { return htx_sl_p3(sl); } -static inline const struct ist htx_sl_res_vsn(const struct htx_sl *sl) +static inline struct ist htx_sl_res_vsn(const struct htx_sl *sl) { return htx_sl_p1(sl); } -static inline const struct ist htx_sl_res_code(const struct htx_sl *sl) +static inline struct ist htx_sl_res_code(const struct htx_sl *sl) { return htx_sl_p2(sl); } -static inline const struct ist htx_sl_res_reason(const struct htx_sl *sl) +static inline struct ist htx_sl_res_reason(const struct htx_sl *sl) { return htx_sl_p3(sl); } diff --git a/src/http.c b/src/http.c index bd8f96f57..7c3f6bbcf 100644 --- a/src/http.c +++ b/src/http.c @@ -362,7 +362,7 @@ enum http_meth_t find_http_meth(const char *str, const int len) /* This function returns HTTP_ERR_ (enum) matching http status code. * Returned value should match codes from http_err_codes. */ -const int http_get_status_idx(unsigned int status) +int http_get_status_idx(unsigned int status) { switch (status) { case 200: return HTTP_ERR_200;