From: Stefan Eissing Date: Thu, 10 Jul 2025 07:36:19 +0000 (+0200) Subject: http2: fix var types in is_alive() implementations X-Git-Tag: curl-8_15_0~54 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51369ae78b6a0cab394433e71c4decc95ffe78f7;p=thirdparty%2Fcurl.git http2: fix var types in is_alive() implementations Closes #17881 --- diff --git a/lib/cf-h2-proxy.c b/lib/cf-h2-proxy.c index c55467c705..b1ad5bc235 100644 --- a/lib/cf-h2-proxy.c +++ b/lib/cf-h2-proxy.c @@ -1501,15 +1501,16 @@ static bool cf_h2_proxy_is_alive(struct Curl_cfilter *cf, bool *input_pending) { struct cf_h2_proxy_ctx *ctx = cf->ctx; - CURLcode result; + bool alive; struct cf_call_data save; + *input_pending = FALSE; CF_DATA_SAVE(save, cf, data); - result = (ctx && ctx->h2 && proxy_h2_connisalive(cf, data, input_pending)); + alive = (ctx && ctx->h2 && proxy_h2_connisalive(cf, data, input_pending)); CURL_TRC_CF(data, cf, "[0] conn alive -> %d, input_pending=%d", - result, *input_pending); + alive, *input_pending); CF_DATA_RESTORE(cf, save); - return result; + return alive; } static CURLcode cf_h2_proxy_query(struct Curl_cfilter *cf, diff --git a/lib/http2.c b/lib/http2.c index 99f40db208..1f65cbdd02 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -2713,15 +2713,16 @@ static bool cf_h2_is_alive(struct Curl_cfilter *cf, bool *input_pending) { struct cf_h2_ctx *ctx = cf->ctx; - CURLcode result; + bool alive; struct cf_call_data save; + *input_pending = FALSE; CF_DATA_SAVE(save, cf, data); - result = (ctx && ctx->h2 && http2_connisalive(cf, data, input_pending)); + alive = (ctx && ctx->h2 && http2_connisalive(cf, data, input_pending)); CURL_TRC_CF(data, cf, "conn alive -> %d, input_pending=%d", - result, *input_pending); + alive, *input_pending); CF_DATA_RESTORE(cf, save); - return result; + return alive; } static CURLcode cf_h2_keep_alive(struct Curl_cfilter *cf,