From bab81aa23e66ea0014ddcfe506caea640db6569a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Aug 2026 01:57:18 +0200 Subject: [PATCH] Fix rpcn type cast warnings --- rpcs3/Emu/NP/rpcn_client.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index 7de63afc0..31c4cbde5 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -720,7 +720,7 @@ namespace rpcn if (data.size() != 4) return error_and_disconnect("Invalid size of ServerInfo packet"); - received_version = reinterpret_cast&>(data[0]); + received_version = read_from_ptr>(data, 0); server_info_received = true; break; } @@ -1656,7 +1656,7 @@ namespace rpcn { std::vector data(COMMUNICATION_ID_SIZE + sizeof(u16)); rpcn_client::write_communication_id(communication_id, data); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = server_id; + write_to_ptr>(data, COMMUNICATION_ID_SIZE, server_id); return forge_send(CommandType::GetWorldList, req_id, data); } @@ -2209,7 +2209,7 @@ namespace rpcn pb_req.SerializeToString(&serialized); std::vector data(serialized.size() + sizeof(u32)); - reinterpret_cast&>(data[0]) = static_cast(serialized.size()); + write_to_ptr>(data, 0, static_cast(serialized.size())); memcpy(data.data() + sizeof(u32), serialized.data(), serialized.size()); return forge_send(CommandType::SendMessage, rpcn_request_counter.fetch_add(1), data); @@ -2309,9 +2309,9 @@ namespace rpcn std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize + sizeof(u32) + score_data.size()); rpcn_client::write_communication_id(communication_id, data); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); + write_to_ptr>(data, COMMUNICATION_ID_SIZE, static_cast(bufsize)); memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), serialized.data(), bufsize); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize]) = static_cast(score_data.size()); + write_to_ptr>(data, COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize, static_cast(score_data.size())); memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32) + bufsize + sizeof(u32), score_data.data(), score_data.size()); return forge_send(CommandType::RecordScoreData, req_id, data); @@ -2612,8 +2612,8 @@ namespace rpcn { std::vector data(COMMUNICATION_ID_SIZE + sizeof(s32) + sizeof(s64)); rpcn_client::write_communication_id(communication_id, data); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = trophy_id; - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE + sizeof(s32)]) = timestamp; + write_to_ptr>(data, COMMUNICATION_ID_SIZE, trophy_id); + write_to_ptr>(data, COMMUNICATION_ID_SIZE + sizeof(s32), timestamp); return forge_send(CommandType::UnlockTrophy, rpcn_request_counter.fetch_add(1), data); } @@ -2626,14 +2626,14 @@ namespace rpcn std::vector data(COMMUNICATION_ID_SIZE + sizeof(u32) + count * (sizeof(s32) + sizeof(s64))), reply_data; rpcn_client::write_communication_id(communication_id, data); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = count; + write_to_ptr>(data, COMMUNICATION_ID_SIZE, count); usz offset = COMMUNICATION_ID_SIZE + sizeof(u32); for (const auto& [tid, ts] : local_unlocked) { - reinterpret_cast&>(data[offset]) = tid; + write_to_ptr>(data, offset, tid); offset += sizeof(s32); - reinterpret_cast&>(data[offset]) = ts; + write_to_ptr>(data, offset, ts); offset += sizeof(s64); } @@ -2927,7 +2927,7 @@ namespace rpcn rpcn_client::write_communication_id(com_id, data); - reinterpret_cast&>(data[COMMUNICATION_ID_SIZE]) = static_cast(bufsize); + write_to_ptr>(data, COMMUNICATION_ID_SIZE, static_cast(bufsize)); memcpy(data.data() + COMMUNICATION_ID_SIZE + sizeof(u32), serialized_data.data(), bufsize); return forge_send(command, packet_id, data); @@ -2938,7 +2938,7 @@ namespace rpcn const usz bufsize = serialized_data.size(); std::vector data(sizeof(u32) + bufsize); - reinterpret_cast&>(data[0]) = static_cast(bufsize); + write_to_ptr>(data, 0, static_cast(bufsize)); memcpy(data.data() + sizeof(u32), serialized_data.data(), bufsize); return forge_send(command, packet_id, data); @@ -2950,9 +2950,9 @@ namespace rpcn std::vector packet(packet_size); packet[0] = static_cast(PacketType::Request); - reinterpret_cast&>(packet[1]) = static_cast(command); - reinterpret_cast&>(packet[3]) = ::narrow(packet_size); - reinterpret_cast&>(packet[7]) = packet_id; + write_to_ptr>(packet, 1, static_cast(command)); + write_to_ptr>(packet, 3, ::narrow(packet_size)); + write_to_ptr>(packet, 7, packet_id); memcpy(packet.data() + RPCN_HEADER_SIZE, data.data(), data.size()); return packet;