Fix +? precedence, unused variable

huitema · huitema · commit 267424fc947f · 2025-03-03T16:22:14.000-08:00
diff --git a/picoquic/quicctx.c b/picoquic/quicctx.c
@@ -3357,7 +3357,7 @@ picoquic_stream_head_t* picoquic_find_stream(picoquic_cnx_t* cnx, uint64_t strea
 void picoquic_add_output_streams(picoquic_cnx_t* cnx, uint64_t old_limit, uint64_t new_limit, unsigned int is_bidir)
 {
     uint64_t old_rank = STREAM_RANK_FROM_ID(old_limit);
-    uint64_t first_new_id = STREAM_ID_FROM_RANK(old_rank + (is_bidir && cnx->client_mode)?1ull:0ull, cnx->client_mode, !is_bidir);
+    uint64_t first_new_id = STREAM_ID_FROM_RANK((old_rank + ((is_bidir && cnx->client_mode)?1ull:0ull)), cnx->client_mode, !is_bidir);
     picoquic_stream_head_t* stream = picoquic_find_stream(cnx, first_new_id );
 
     while (stream) {
diff --git a/picoquictest/add_block_test.c b/picoquictest/add_block_test.c
@@ -355,7 +355,6 @@ int add_block_test_step(add_block_test_ctx_t* add_block_ctx, int is_losing_data,
     int arrival_index = -1;
     uint64_t next_departure_time = UINT64_MAX;
     int departure_index = -1;
-    int need_frame_departure = 0;
     uint64_t next_frame_time = UINT64_MAX;
     uint64_t next_time;
     /* Check earliest packet arrival */

Original file line number	Diff line number	Diff line change
`@@ -3357,7 +3357,7 @@ picoquic_stream_head_t* picoquic_find_stream(picoquic_cnx_t* cnx, uint64_t strea`
`3357`	`3357`	`void picoquic_add_output_streams(picoquic_cnx_t* cnx, uint64_t old_limit, uint64_t new_limit, unsigned int is_bidir)`
`3358`	`3358`	`{`
`3359`	`3359`	`uint64_t old_rank = STREAM_RANK_FROM_ID(old_limit);`
`3360`		`- uint64_t first_new_id = STREAM_ID_FROM_RANK(old_rank + (is_bidir && cnx->client_mode)?1ull:0ull, cnx->client_mode, !is_bidir);`
	`3360`	`+ uint64_t first_new_id = STREAM_ID_FROM_RANK((old_rank + ((is_bidir && cnx->client_mode)?1ull:0ull)), cnx->client_mode, !is_bidir);`
`3361`	`3361`	`picoquic_stream_head_t* stream = picoquic_find_stream(cnx, first_new_id );`
`3362`	`3362`
`3363`	`3363`	`while (stream) {`