From 8f4d1068aa74bd61dcac796ba98a086b8582e780 Mon Sep 17 00:00:00 2001
From: Stefan Eissing <stefan@eissing.org>
Date: Mon, 28 Jul 2025 16:30:42 +0200
Subject: [PATCH] make int* into bool*

---
 lib/cf-haproxy.c |  2 +-
 lib/cfilters.c   | 16 ++++++++++------
 lib/cfilters.h   |  4 ++--
 lib/connect.c    |  2 +-
 lib/ftp.c        |  4 ++--
 lib/ldap.c       |  2 +-
 lib/socks.c      |  2 +-
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/cf-haproxy.c b/lib/cf-haproxy.c
index 06dd9dd288..62ac89e819 100644
--- a/lib/cf-haproxy.c
+++ b/lib/cf-haproxy.c
@@ -72,7 +72,7 @@ static CURLcode cf_haproxy_date_out_set(struct Curl_cfilter*cf,
   CURLcode result;
   const char *client_ip;
   struct ip_quadruple ipquad;
-  int is_ipv6;
+  bool is_ipv6;
 
   DEBUGASSERT(ctx);
   DEBUGASSERT(ctx->state == HAPROXY_INIT);
diff --git a/lib/cfilters.c b/lib/cfilters.c
index a57aeef55d..c7333e12b0 100644
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -445,7 +445,7 @@ static CURLcode cf_verboseconnect(struct Curl_easy *data,
 {
   if(Curl_trc_is_verbose(data)) {
     struct ip_quadruple ipquad;
-    int is_ipv6;
+    bool is_ipv6;
     CURLcode result;
 
     result = Curl_conn_cf_get_ip_info(cf, data, &is_ipv6, &ipquad);
@@ -620,7 +620,7 @@ bool Curl_conn_get_ssl_info(struct Curl_easy *data,
 
 CURLcode Curl_conn_get_ip_info(struct Curl_easy *data,
                                struct connectdata *conn, int sockindex,
-                               int *is_ipv6, struct ip_quadruple *ipquad)
+                               bool *is_ipv6, struct ip_quadruple *ipquad)
 {
   struct Curl_cfilter *cf = conn ? conn->cfilter[sockindex] : NULL;
   return Curl_conn_cf_get_ip_info(cf, data, is_ipv6, ipquad);
@@ -874,11 +874,15 @@ cf_get_remote_addr(struct Curl_cfilter *cf, struct Curl_easy *data)
 
 CURLcode Curl_conn_cf_get_ip_info(struct Curl_cfilter *cf,
                                   struct Curl_easy *data,
-                                  int *is_ipv6, struct ip_quadruple *ipquad)
+                                  bool *is_ipv6, struct ip_quadruple *ipquad)
 {
-  if(cf)
-    return cf->cft->query(cf, data, CF_QUERY_IP_INFO, is_ipv6, ipquad);
-  return CURLE_UNKNOWN_OPTION;
+  CURLcode result = CURLE_UNKNOWN_OPTION;
+  if(cf) {
+    int ipv6 = 0;
+    result = cf->cft->query(cf, data, CF_QUERY_IP_INFO, &ipv6, ipquad);
+    *is_ipv6 = !!ipv6;
+  }
+  return result;
 }
 
 curl_socket_t Curl_conn_get_socket(struct Curl_easy *data, int sockindex)
diff --git a/lib/cfilters.h b/lib/cfilters.h
index 74a79da78b..0b6e1044fc 100644
--- a/lib/cfilters.h
+++ b/lib/cfilters.h
@@ -345,7 +345,7 @@ curl_socket_t Curl_conn_cf_get_socket(struct Curl_cfilter *cf,
 
 CURLcode Curl_conn_cf_get_ip_info(struct Curl_cfilter *cf,
                                   struct Curl_easy *data,
-                                  int *is_ipv6, struct ip_quadruple *ipquad);
+                                  bool *is_ipv6, struct ip_quadruple *ipquad);
 
 bool Curl_conn_cf_needs_flush(struct Curl_cfilter *cf,
                               struct Curl_easy *data);
@@ -406,7 +406,7 @@ bool Curl_conn_get_ssl_info(struct Curl_easy *data,
 
 CURLcode Curl_conn_get_ip_info(struct Curl_easy *data,
                                struct connectdata *conn, int sockindex,
-                               int *is_ipv6, struct ip_quadruple *ipquad);
+                               bool *is_ipv6, struct ip_quadruple *ipquad);
 
 /**
  * Connection provides multiplexing of easy handles at `socketindex`.
diff --git a/lib/connect.c b/lib/connect.c
index 473ec23108..7c36ccd40e 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1000,7 +1000,7 @@ static CURLcode cf_he_connect(struct Curl_cfilter *cf,
 #ifndef CURL_DISABLE_VERBOSE_STRINGS
         if(Curl_trc_cf_is_verbose(cf, data)) {
           struct ip_quadruple ipquad;
-          int is_ipv6;
+          bool is_ipv6;
           if(!Curl_conn_cf_get_ip_info(cf->next, data, &is_ipv6, &ipquad)) {
             const char *host;
             int port;
diff --git a/lib/ftp.c b/lib/ftp.c
index a748f928da..18613ae80e 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1797,7 +1797,7 @@ static char *control_address_dup(struct Curl_easy *data,
                                  struct connectdata *conn)
 {
     struct ip_quadruple ipquad;
-    int is_ipv6;
+    bool is_ipv6;
 
   /* Returns the control connection IP address.
      If a proxy tunnel is used, returns the original hostname instead, because
@@ -1931,7 +1931,7 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
      * here. We do not want to rely on a former host lookup that might've
      * expired now, instead we remake the lookup here and now! */
     struct ip_quadruple ipquad;
-    int is_ipv6;
+    bool is_ipv6;
     const char * const host_name = conn->bits.socksproxy ?
       conn->socks_proxy.host.name : conn->http_proxy.host.name;
 
diff --git a/lib/ldap.c b/lib/ldap.c
index de5a309755..3880d35d60 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -336,7 +336,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
   char *user = NULL;
   char *passwd = NULL;
   struct ip_quadruple ipquad;
-  int is_ipv6;
+  bool is_ipv6;
 
   *done = TRUE; /* unconditionally */
   infof(data, "LDAP local: LDAP Vendor = %s ; LDAP Version = %d",
diff --git a/lib/socks.c b/lib/socks.c
index fea5c50cdd..64795d69ee 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -1142,7 +1142,7 @@ static CURLcode socks_proxy_cf_connect(struct Curl_cfilter *cf,
 #ifndef CURL_DISABLE_VERBOSE_STRINGS
     if(Curl_trc_is_verbose(data)) {
       struct ip_quadruple ipquad;
-      int is_ipv6;
+      bool is_ipv6;
       result = Curl_conn_cf_get_ip_info(cf->next, data, &is_ipv6, &ipquad);
       if(result)
         return result;