From 87a5837e1079e5eaaeea72888e984618cc0c6f25 Mon Sep 17 00:00:00 2001 From: two-heart <12869538+two-heart@users.noreply.github.com> Date: Fri, 16 May 2025 16:32:29 +0200 Subject: [PATCH] chore: fix static analysis warnings --- src/disco/archiver/fd_archiver_backtest.c | 2 +- src/discof/eqvoc/fd_eqvoc_tile.c | 2 +- src/discof/repair/fd_repair_tile.c | 2 +- src/discof/replay/fd_replay_tile.c | 10 +++++----- src/discof/rpcserver/fd_rpc_service.c | 2 +- src/discof/store/fd_storei_tile.c | 8 ++++---- src/flamenco/runtime/program/fd_bpf_loader_program.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/disco/archiver/fd_archiver_backtest.c b/src/disco/archiver/fd_archiver_backtest.c index 2341797a4b..e37bf81c9f 100644 --- a/src/disco/archiver/fd_archiver_backtest.c +++ b/src/disco/archiver/fd_archiver_backtest.c @@ -300,7 +300,7 @@ after_frag( fd_archiver_backtest_tile_ctx_t * ctx, ulong sz FD_PARAM_UNUSED, ulong tsorig FD_PARAM_UNUSED, ulong tspub FD_PARAM_UNUSED, - fd_stem_context_t * stem FD_PARAM_UNUSED ) { + fd_stem_context_t * stem ) { if( FD_LIKELY( ctx->replay_notification.type==FD_REPLAY_SLOT_TYPE ) ) { ulong slot = ctx->replay_notification.slot_exec.slot; ulong slot_be = fd_ulong_bswap(slot); diff --git a/src/discof/eqvoc/fd_eqvoc_tile.c b/src/discof/eqvoc/fd_eqvoc_tile.c index 194421ea96..5b279ec03d 100644 --- a/src/discof/eqvoc/fd_eqvoc_tile.c +++ b/src/discof/eqvoc/fd_eqvoc_tile.c @@ -132,7 +132,7 @@ during_frag( fd_eqvoc_tile_ctx_t * ctx, uchar const * packet = fd_chunk_to_laddr_const( ctx->shred_net_in_mem, chunk ); fd_shred_t * shred = (fd_shred_t *)( packet + fd_disco_netmux_sig_hdr_sz( sig ) ); - memcpy( &ctx->shred, shred, sizeof(fd_shred_t) ); + ctx->shred = *shred; } } diff --git a/src/discof/repair/fd_repair_tile.c b/src/discof/repair/fd_repair_tile.c index 7c22e26b7a..656624b19d 100644 --- a/src/discof/repair/fd_repair_tile.c +++ b/src/discof/repair/fd_repair_tile.c @@ -879,7 +879,7 @@ after_frag( fd_repair_tile_ctx_t * ctx, ulong seq FD_PARAM_UNUSED, ulong sig FD_PARAM_UNUSED, ulong sz, - ulong tsorig FD_PARAM_UNUSED, + ulong tsorig, ulong tspub FD_PARAM_UNUSED, fd_stem_context_t * stem ) { diff --git a/src/discof/replay/fd_replay_tile.c b/src/discof/replay/fd_replay_tile.c index e38d515763..bee2d2b010 100644 --- a/src/discof/replay/fd_replay_tile.c +++ b/src/discof/replay/fd_replay_tile.c @@ -703,7 +703,7 @@ block_finalize_tiles_cb( void * para_arg_1, happiness, in order, executable immediately as long as the mcache wasn't overrun. */ static int -before_frag( fd_replay_tile_ctx_t * ctx FD_PARAM_UNUSED, +before_frag( fd_replay_tile_ctx_t * ctx, ulong in_idx, ulong seq, ulong sig ) { @@ -1130,8 +1130,8 @@ publish_slot_notifications( fd_replay_tile_ctx_t * ctx, msg->slot_exec.height = block_entry_block_height; msg->slot_exec.transaction_count = fork->slot_ctx->slot_bank.transaction_count; msg->slot_exec.shred_cnt = fork->slot_ctx->shred_cnt; - memcpy( &msg->slot_exec.bank_hash, &fork->slot_ctx->slot_bank.banks_hash, sizeof( fd_hash_t ) ); - memcpy( &msg->slot_exec.block_hash, &ctx->blockhash, sizeof( fd_hash_t ) ); + msg->slot_exec.bank_hash = fork->slot_ctx->slot_bank.banks_hash; + msg->slot_exec.block_hash = ctx->blockhash; memcpy( &msg->slot_exec.identity, ctx->validator_identity_pubkey, sizeof( fd_pubkey_t ) ); msg->slot_exec.ts = tsorig; NOTIFY_END; @@ -1627,7 +1627,7 @@ exec_slice( fd_replay_tile_ctx_t * ctx, ctx->slice_exec_ctx.wmark += pay_sz; fd_runtime_public_txn_msg_t * exec_msg = (fd_runtime_public_txn_msg_t *)fd_chunk_to_laddr( exec_out->mem, exec_out->chunk ); - memcpy( &exec_msg->txn, &txn_p, sizeof(fd_txn_p_t) ); + exec_msg->txn = txn_p; fd_fork_t * fork = fd_fork_frontier_ele_query( ctx->forks->frontier, &slot, @@ -1701,7 +1701,7 @@ exec_slice( fd_replay_tile_ctx_t * ctx, FD_COMPILER_MFENCE(); block_info->flags = fd_uchar_clear_bit( block_info->flags, FD_BLOCK_FLAG_REPLAYING ); memcpy( &block_info->block_hash, hdr->hash, sizeof(fd_hash_t) ); - memcpy( &block_info->bank_hash, &fork->slot_ctx->slot_bank.banks_hash, sizeof(fd_hash_t) ); + block_info->bank_hash = fork->slot_ctx->slot_bank.banks_hash; fd_block_map_publish( query ); ctx->flags = EXEC_FLAG_FINISHED_SLOT; diff --git a/src/discof/rpcserver/fd_rpc_service.c b/src/discof/rpcserver/fd_rpc_service.c index 0d18597ddb..de4875d654 100644 --- a/src/discof/rpcserver/fd_rpc_service.c +++ b/src/discof/rpcserver/fd_rpc_service.c @@ -2434,7 +2434,7 @@ fd_rpc_create_ctx(fd_rpcserver_args_t * args, fd_rpc_ctx_t ** ctx_p) { if( bind(gctx->tpu_socket, (const struct sockaddr*)fd_type_pun_const(&addrLocal), sizeof(addrLocal)) == -1 ) { FD_LOG_ERR(( "bind failed (%i-%s)", errno, strerror( errno ) )); } - memcpy( &gctx->tpu_addr, &args->tpu_addr, sizeof(struct sockaddr_in) ); + gctx->tpu_addr = args->tpu_addr; void * mem = fd_valloc_malloc( valloc, fd_rpc_acct_map_align(), fd_rpc_acct_map_footprint( FD_RPC_ACCT_MAP_POOL_SIZE/2 ) ); gctx->acct_map = fd_rpc_acct_map_join( fd_rpc_acct_map_new( mem, FD_RPC_ACCT_MAP_POOL_SIZE/2, 0 ) ); diff --git a/src/discof/store/fd_storei_tile.c b/src/discof/store/fd_storei_tile.c index f345c1f459..ef5102e9f6 100644 --- a/src/discof/store/fd_storei_tile.c +++ b/src/discof/store/fd_storei_tile.c @@ -236,10 +236,10 @@ after_frag( fd_store_tile_ctx_t * ctx, ulong in_idx, ulong seq FD_PARAM_UNUSED, ulong sig FD_PARAM_UNUSED, - ulong sz FD_PARAM_UNUSED, - ulong tsorig FD_PARAM_UNUSED, - ulong tspub FD_PARAM_UNUSED, - fd_stem_context_t * stem FD_PARAM_UNUSED ) { + ulong sz, + ulong tsorig, + ulong tspub, + fd_stem_context_t * stem ) { return; ulong const in_kind = ctx->in_kind[ in_idx ]; diff --git a/src/flamenco/runtime/program/fd_bpf_loader_program.c b/src/flamenco/runtime/program/fd_bpf_loader_program.c index 8e1c8b29ce..4271d210c3 100644 --- a/src/flamenco/runtime/program/fd_bpf_loader_program.c +++ b/src/flamenco/runtime/program/fd_bpf_loader_program.c @@ -1408,7 +1408,7 @@ process_loader_upgradeable_instruction( fd_exec_instr_ctx_t * instr_ctx ) { /* copy in the authority public key into the authority address. https://github.com/anza-xyz/agave/blob/v2.1.14/programs/bpf_loader/src/lib.rs#L926-L928 */ - memcpy( account_state->inner.buffer.authority_address, new_authority, sizeof(fd_pubkey_t) ); + *account_state->inner.buffer.authority_address = *new_authority; err = fd_bpf_loader_v3_program_set_state( &account, account_state ); if( FD_UNLIKELY( err!=FD_BINCODE_SUCCESS ) ) { @@ -1431,7 +1431,7 @@ process_loader_upgradeable_instruction( fd_exec_instr_ctx_t * instr_ctx ) { /* copy in the authority public key into the upgrade authority address. https://github.com/anza-xyz/agave/blob/v2.1.14/programs/bpf_loader/src/lib.rs#L946-L949 */ if( new_authority ) { - memcpy( account_state->inner.program_data.upgrade_authority_address, new_authority, sizeof(fd_pubkey_t) ); + *account_state->inner.program_data.upgrade_authority_address = *new_authority; } else { account_state->inner.program_data.upgrade_authority_address = NULL; }