Merge pull request #1843 from hfstco/quicfix-build-warnings

huitema · web-flow · commit 4899fd94f220 · 2025-02-20T17:48:14.000-08:00
compiler warnings
diff --git a/picoquicfirst/picoquicdemo.c b/picoquicfirst/picoquicdemo.c
@@ -658,7 +658,7 @@ int client_loop_cb(picoquic_quic_t* quic, picoquic_packet_loop_cb_enum cb_mode,
                 if (cb_ctx->multipath_initiated == 0) {
                     int is_already_allowed = 0;
                     cb_ctx->multipath_initiated = 1;
-                    if (ret = picoquic_subscribe_new_path_allowed(cb_ctx->cnx_client, &is_already_allowed) == 0) {
+                    if ((ret = picoquic_subscribe_new_path_allowed(cb_ctx->cnx_client, &is_already_allowed)) == 0) {
                         if (is_already_allowed) {
                             ret = client_create_additional_path(cb_ctx->cnx_client, cb_ctx);
                         }
diff --git a/picoquictest/picoquic_ns.c b/picoquictest/picoquic_ns.c
@@ -644,7 +644,7 @@ void picoquic_ns_simlink_reset(picoquictest_sim_link_t* link, double data_rate_i
         link->last_packet = previous_packet;
     }
     /* Requeue the other packets:
-    /* reset the queue time to current_time, i.e., after packets in transit are delivered.*/
+     * reset the queue time to current_time, i.e., after packets in transit are delivered.*/
     link->queue_time = current_time;
     /* reset the leaky bucket, so it starts working from the current time. */
     link->bucket_arrival_last = current_time;

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ int client_loop_cb(picoquic_quic_t* quic, picoquic_packet_loop_cb_enum cb_mode,`
`658`	`658`	`if (cb_ctx->multipath_initiated == 0) {`
`659`	`659`	`int is_already_allowed = 0;`
`660`	`660`	`cb_ctx->multipath_initiated = 1;`
`661`		`- if (ret = picoquic_subscribe_new_path_allowed(cb_ctx->cnx_client, &is_already_allowed) == 0) {`
	`661`	`+ if ((ret = picoquic_subscribe_new_path_allowed(cb_ctx->cnx_client, &is_already_allowed)) == 0) {`
`662`	`662`	`if (is_already_allowed) {`
`663`	`663`	`ret = client_create_additional_path(cb_ctx->cnx_client, cb_ctx);`
`664`	`664`	`}`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ void picoquic_ns_simlink_reset(picoquictest_sim_link_t* link, double data_rate_i`
`644`	`644`	`link->last_packet = previous_packet;`
`645`	`645`	`}`
`646`	`646`	`/* Requeue the other packets:`
`647`		`- /* reset the queue time to current_time, i.e., after packets in transit are delivered.*/`
	`647`	`+ * reset the queue time to current_time, i.e., after packets in transit are delivered.*/`
`648`	`648`	`link->queue_time = current_time;`
`649`	`649`	`/* reset the leaky bucket, so it starts working from the current time. */`
`650`	`650`	`link->bucket_arrival_last = current_time;`