From: Mate Kukri <mate.kukri@canonical.com>
Date: Wed, 29 Nov 2023 19:58:25 +0000 (+0000)
Subject: net/http: Fix gcc-13 errors relating to type signedness
X-Git-Tag: grub-2.12~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=069cc46c9648669fc1f76a719e1526adc3fdb6c6;p=thirdparty%2Fgrub.git

net/http: Fix gcc-13 errors relating to type signedness

Replace definition of HTTP_PORT with a pre-processor macro that converts
the constant to the correct grub_uint16_t type.

Change "port" local variable definition in http_establish() to have the
same type.

Signed-off-by: Mate Kukri <mate.kukri@canonical.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com
---

diff --git a/grub-core/net/http.c b/grub-core/net/http.c
index df690acf6..f389bf03d 100644
--- a/grub-core/net/http.c
+++ b/grub-core/net/http.c
@@ -29,11 +29,7 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
-enum
-  {
-    HTTP_PORT = 80
-  };
-
+#define HTTP_PORT	((grub_uint16_t) 80)
 
 typedef struct http_data
 {
@@ -319,7 +315,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
   struct grub_net_buff *nb;
   grub_err_t err;
   char *server = file->device->net->server;
-  int port = file->device->net->port;
+  grub_uint16_t port = file->device->net->port;
 
   nb = grub_netbuff_alloc (GRUB_NET_TCP_RESERVE_SIZE
 			   + sizeof ("GET ") - 1