From e15666a1769784847e237eb816f014dd9335866e Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Thu, 23 Jun 2022 14:13:33 +0200 Subject: [PATCH] Improve some loops --- httpparse.c | 2 +- httpser.c | 7 +++---- httputil.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/httpparse.c b/httpparse.c index c63e039..4848be8 100644 --- a/httpparse.c +++ b/httpparse.c @@ -152,7 +152,7 @@ int httplib_parse_header(http_request * self, char * str) { self->headers = httplib_header_new(key, value); } else { http_header * run = self->headers; - while (run != 0) { + while (run) { if (run->next == 0) { run->next = httplib_header_new(key, value); break; diff --git a/httpser.c b/httpser.c index 8e3c709..3b485d2 100644 --- a/httpser.c +++ b/httpser.c @@ -30,7 +30,7 @@ int httplib_response_serialize(http_response * res, char * str_out) { strcat(str_out, res->status_message); strcat(str_out, "\r\n"); http_header * run = res->headers; - while (run != 0) { + while (run) { char * tmp = malloc(httplib_header_string_size(run)); int err = httplib_header_serialize(run, tmp); if (err != 0) return err; @@ -48,8 +48,7 @@ int httplib_response_serialize(http_response * res, char * str_out) { strcat(str_out, "\r\n"); } strcat(str_out, "\r\n"); - size_t end_pos = 0; - while (str_out[end_pos] != '\0') end_pos++; + size_t end_pos = strlen(str_out) - 1; if (res->body != 0) { for (size_t i = 0; i < res->content_length; i++) { str_out[end_pos + i] = res->body[i]; @@ -62,7 +61,7 @@ size_t httplib_response_string_size(http_response * res) { size_t res_line = 15 + strlen(res->status_message); //"HTTP/1.1" 000 (message)\r\n size_t headers = 2; // \r\n http_header * run = res->headers; - while (run != 0) { + while (run) { headers += httplib_header_string_size(run) + 1; // \r\n instead of \0 run = run->next; } diff --git a/httputil.c b/httputil.c index c36f504..64b768c 100644 --- a/httputil.c +++ b/httputil.c @@ -41,7 +41,7 @@ int httplib_response_add_header(http_response * self, char * key, char * value) self->headers = httplib_header_new(key, value); } else { http_header * run = self->headers; - while (run != 0) { + while (run) { if (run->next == 0) { run->next = httplib_header_new(key, value); break; @@ -54,7 +54,7 @@ int httplib_response_add_header(http_response * self, char * key, char * value) char * httplib_request_get_header(http_request * self, char * key) { http_header * run = self->headers; - while (run != 0) { + while (run) { if (!strcasecmp(key, run->key)) { char * value = malloc(strlen(run->value)+1); strcpy(value, run->value);