From 78ee3dc755e487fb061deff97c69a2907383808e Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 9 Jun 2026 13:49:05 +0200 Subject: [PATCH] Fix compiler warnings regarding const modifiers --- src/lib/http.c | 2 +- src/lib/proxy.c | 8 ++++---- src/lib/uri.c | 2 +- src/lib/uri.h | 2 +- src/lib/utils.c | 4 ++-- src/lib/utils.h | 4 ++-- src/worker/local_handler.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/http.c b/src/lib/http.c index 04c9b34..c4f4e9b 100644 --- a/src/lib/http.c +++ b/src/lib/http.c @@ -132,7 +132,7 @@ int http_parse_header_field(http_hdr *hdr, const char *buf, const char *end_ptr, if (hdr->last_field_num > list_size(hdr->fields)) return http_error(HTTP_ERROR_GENERAL); - char *pos1 = (char *) buf, *pos2 = (char *) end_ptr; + const char *pos1 = buf, *pos2 = end_ptr; if (buf[0] == ' ' || buf[0] == '\t') { if (hdr->last_field_num == -1) return http_error(HTTP_ERROR_GENERAL); diff --git a/src/lib/proxy.c b/src/lib/proxy.c index 6713ca1..88fc41c 100644 --- a/src/lib/proxy.c +++ b/src/lib/proxy.c @@ -211,13 +211,13 @@ int proxy_request_header(http_req *req, sock *sock) { if (forwarded == NULL) { http_add_header_field(&req->hdr, "X-Forwarded-Host", http_get_header_field(&req->hdr, "Host")); } else { - char *ptr = strchr(forwarded, ','); + const char *ptr = strchr(forwarded, ','); unsigned long len; if (ptr != NULL) len = ptr - forwarded; else len = strlen(forwarded); ptr = strstr(forwarded, "host="); if ((ptr - forwarded) < len) { - char *end = strchr(ptr, ';'); + const char *end = strchr(ptr, ';'); if (end == NULL) len -= (ptr - forwarded); else len = (end - ptr); len -= 5; @@ -233,13 +233,13 @@ int proxy_request_header(http_req *req, sock *sock) { if (forwarded == NULL) { http_add_header_field(&req->hdr, "X-Forwarded-Proto", sock->enc ? "https" : "http"); } else { - char *ptr = strchr(forwarded, ','); + const char *ptr = strchr(forwarded, ','); unsigned long len; if (ptr != NULL) len = ptr - forwarded; else len = strlen(forwarded); ptr = strstr(forwarded, "proto="); if ((ptr - forwarded) < len) { - char *end = strchr(ptr, ';'); + const char *end = strchr(ptr, ';'); if (end == NULL) len -= (ptr - forwarded); else len = (end - ptr); len -= 6; diff --git a/src/lib/uri.c b/src/lib/uri.c index cb20bec..c94e427 100644 --- a/src/lib/uri.c +++ b/src/lib/uri.c @@ -38,7 +38,7 @@ int path_exists(const char *path) { return ret == 0; } -int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mode) { +int uri_init(http_uri *uri, const char *webroot, char *uri_str, int dir_mode) { char buf0[1024], buf1[1024], buf2[1024], buf3[1024], buf4[1024]; int p_len; diff --git a/src/lib/uri.h b/src/lib/uri.h index 783ef84..0be6f5b 100644 --- a/src/lib/uri.h +++ b/src/lib/uri.h @@ -42,7 +42,7 @@ typedef struct { } http_uri; -int uri_init(http_uri *uri, const char *webroot, const char *uri_str, int dir_mode); +int uri_init(http_uri *uri, const char *webroot, char *uri_str, int dir_mode); int uri_init_cache(http_uri *uri); diff --git a/src/lib/utils.c b/src/lib/utils.c index 984bc8d..31808d1 100644 --- a/src/lib/utils.c +++ b/src/lib/utils.c @@ -193,7 +193,7 @@ int strcpy_rem_webroot(char *dst, const char *src, const char *webroot) { return 0; } -int str_trim(char **start, char **end) { +int str_trim(const char **start, const char **end) { if (start == NULL || end == NULL || *start == NULL || *end == NULL) return -1; @@ -204,7 +204,7 @@ int str_trim(char **start, char **end) { return 0; } -int str_trim_lws(char **start, char **end) { +int str_trim_lws(const char **start, const char **end) { if (start == NULL || end == NULL || *start == NULL || *end == NULL) return -1; diff --git a/src/lib/utils.h b/src/lib/utils.h index 0bc544e..b3152af 100644 --- a/src/lib/utils.h +++ b/src/lib/utils.h @@ -33,9 +33,9 @@ int mime_is_text(const char *restrict type); int strcpy_rem_webroot(char *dst, const char *str, const char *webroot); -int str_trim(char **start, char **end); +int str_trim(const char **start, const char **end); -int str_trim_lws(char **start, char **end); +int str_trim_lws(const char **start, const char **end); int streq(const char *restrict str1, const char *restrict str2); diff --git a/src/worker/local_handler.c b/src/worker/local_handler.c index 152c671..2717a8b 100644 --- a/src/worker/local_handler.c +++ b/src/worker/local_handler.c @@ -39,7 +39,7 @@ void local_handler_func(client_ctx_t *ctx) { static int range_handler(client_ctx_t *ctx) { char buf[64]; long num0, num1, num2; - char *ptr; + const char *ptr; int mode; const char *range = http_get_header_field(&ctx->req.hdr, "Range");