1 files changed, 10 insertions, 16 deletions

diff --git a/libs/libcurl/src/vquic/curl_quiche.c b/libs/libcurl/src/vquic/curl_quiche.c
index 1cf37f7a16..c587b13571 100644
--- a/libs/libcurl/src/vquic/curl_quiche.c
+++ b/libs/libcurl/src/vquic/curl_quiche.c
@@ -277,7 +277,7 @@ static CURLcode h3_data_setup(struct Curl_cfilter *cf,
   stream->id = -1;

   Curl_bufq_initp(&stream->recvbuf, &ctx->stream_bufcp,

                   H3_STREAM_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);

-  DEBUGF(LOG_CF(data, cf, "data setup (easy %p)", (void *)data));

+  DEBUGF(LOG_CF(data, cf, "data setup"));

   return CURLE_OK;

 }

 

@@ -425,10 +425,6 @@ static ssize_t stream_resp_read(void *reader_ctx,
     *err = CURLE_OK;

     return nread;

   }

-  else if(nread < 0) {

-    *err = CURLE_AGAIN;

-    return -1;

-  }

   else {

     *err = stream->resp_got_header? CURLE_PARTIAL_FILE : CURLE_RECV_ERROR;

     return -1;

@@ -649,7 +645,7 @@ static CURLcode recv_pkt(const unsigned char *pkt, size_t pktlen,
     }

   }

   else if((size_t)nread < pktlen) {

-    DEBUGF(LOG_CF(r->data, r->cf, "ingress, quiche only read %zd/%zd bytes",

+    DEBUGF(LOG_CF(r->data, r->cf, "ingress, quiche only read %zd/%zu bytes",

                   nread, pktlen));

   }

 

@@ -826,7 +822,7 @@ static ssize_t cf_quiche_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
 

   if(!stream) {

     *err = CURLE_RECV_ERROR;

-    goto out;

+    return -1;

   }

 

   if(!Curl_bufq_is_empty(&stream->recvbuf)) {

@@ -883,8 +879,10 @@ out:
   }

   if(nread > 0)

     ctx->data_recvd += nread;

-  DEBUGF(LOG_CF(data, cf, "[h3sid=%"PRId64"] cf_recv(total=%zd) -> %zd, %d",

-                stream->id, ctx->data_recvd, nread, *err));

+  DEBUGF(LOG_CF(data, cf, "[h3sid=%"PRId64"] cf_recv(total=%"

+                CURL_FORMAT_CURL_OFF_T ") -> %zd, %d",

+                stream ? stream->id : (int64_t)0,

+                ctx->data_recvd, nread, *err));

   return nread;

 }

 

@@ -909,8 +907,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
   if(!stream) {

     *err = h3_data_setup(cf, data);

     if(*err) {

-      nwritten = -1;

-      goto out;

+      return -1;

     }

     stream = H3_STREAM_CTX(data);

     DEBUGASSERT(stream);

@@ -995,8 +992,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
   stream->closed = FALSE;

   stream->reset = FALSE;

 

-  infof(data, "Using HTTP/3 Stream ID: %" PRId64 " (easy handle %p)",

-        stream3_id, (void *)data);

+  infof(data, "Using HTTP/3 Stream ID: %" PRId64, stream3_id);

   DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] opened for %s",

                 stream3_id, data->state.url));

 

@@ -1068,7 +1064,7 @@ static ssize_t cf_quiche_send(struct Curl_cfilter *cf, struct Curl_easy *data,
         stream->send_closed = TRUE;

 

       DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] send body(len=%zu, "

-                    "left=%zd) -> %zd",

+                              "left=%" CURL_FORMAT_CURL_OFF_T ") -> %zd",

                     stream->id, len, stream->upload_left, nwritten));

       *err = CURLE_OK;

     }

@@ -1555,13 +1551,11 @@ static bool cf_quiche_conn_is_alive(struct Curl_cfilter *cf,
        not in use by any other transfer, there shouldn't be any data here,

        only "protocol frames" */

     *input_pending = FALSE;

-    Curl_attach_connection(data, cf->conn);

     if(cf_process_ingress(cf, data))

       alive = FALSE;

     else {

       alive = TRUE;

     }

-    Curl_detach_connection(data);

   }

 

   return alive;