From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 18 Apr 2024 14:49:10 +0000 (+0200)
Subject: urlapi: remove unused flags argument from Curl_url_set_authority
X-Git-Tag: curl-8_8_0~188
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a25b3e0149c5ac7ed455c4a2bbad5ef4813fb11;p=thirdparty%2Fcurl.git

urlapi: remove unused flags argument from Curl_url_set_authority

The function is only called from a single place (for HTTP/2 server push)
so might as well just assume this fixed option every time.

Closes #13409
---

diff --git a/lib/http2.c b/lib/http2.c
index 99fdd8a7b1..1ee57a4320 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -832,7 +832,7 @@ static int set_transfer_url(struct Curl_easy *data,
 
   v = curl_pushheader_byname(hp, HTTP_PSEUDO_AUTHORITY);
   if(v) {
-    uc = Curl_url_set_authority(u, v, CURLU_DISALLOW_USER);
+    uc = Curl_url_set_authority(u, v);
     if(uc) {
       rc = 2;
       goto fail;
diff --git a/lib/urlapi-int.h b/lib/urlapi-int.h
index d6e240aa36..c40281a898 100644
--- a/lib/urlapi-int.h
+++ b/lib/urlapi-int.h
@@ -28,8 +28,7 @@
 size_t Curl_is_absolute_url(const char *url, char *buf, size_t buflen,
                             bool guess_scheme);
 
-CURLUcode Curl_url_set_authority(CURLU *u, const char *authority,
-                                 unsigned int flags);
+CURLUcode Curl_url_set_authority(CURLU *u, const char *authority);
 
 #ifdef DEBUGBUILD
 CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host,
diff --git a/lib/urlapi.c b/lib/urlapi.c
index c6d2370116..308bc2745a 100644
--- a/lib/urlapi.c
+++ b/lib/urlapi.c
@@ -851,8 +851,8 @@ out:
   return uc;
 }
 
-CURLUcode Curl_url_set_authority(CURLU *u, const char *authority,
-                                 unsigned int flags)
+/* used for HTTP/2 server push */
+CURLUcode Curl_url_set_authority(CURLU *u, const char *authority)
 {
   CURLUcode result;
   struct dynbuf host;
@@ -860,8 +860,8 @@ CURLUcode Curl_url_set_authority(CURLU *u, const char *authority,
   DEBUGASSERT(authority);
   Curl_dyn_init(&host, CURL_MAX_INPUT_LENGTH);
 
-  result = parse_authority(u, authority, strlen(authority), flags,
-                           &host, !!u->scheme);
+  result = parse_authority(u, authority, strlen(authority),
+                           CURLU_DISALLOW_USER, &host, !!u->scheme);
   if(result)
     Curl_dyn_free(&host);
   else {