From e48874a91a86ef561aa4b3298d6170ec9777954e Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Thu, 23 Jan 2025 10:17:14 -0500 Subject: Version subproject directories - Reorder packet functions and add u32 to ext. Signed-off-by: Andrew Opalach --- src/util/packet.c | 1 + src/util/packet.h | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/util') diff --git a/src/util/packet.c b/src/util/packet.c index 1516f0f..4f1541c 100644 --- a/src/util/packet.c +++ b/src/util/packet.c @@ -91,6 +91,7 @@ DEFINE_PACKET_READ_FUNC(s8) DEFINE_PACKET_READ_FUNC(u16) DEFINE_PACKET_READ_FUNC(s16) DEFINE_PACKET_READ_FUNC(u32) +DEFINE_PACKET_READ_FUNC_EXT(u32) DEFINE_PACKET_READ_FUNC(s32) DEFINE_PACKET_READ_FUNC_EXT(s32) DEFINE_PACKET_READ_FUNC(u64) diff --git a/src/util/packet.h b/src/util/packet.h index 8af502c..b2348ca 100644 --- a/src/util/packet.h +++ b/src/util/packet.h @@ -46,30 +46,31 @@ void nn_packet_write_size(struct nn_packet *packet); u32 nn_packet_get_size(struct nn_packet *packet); void nn_packet_write_bool(struct nn_packet *packet, bool v); -void nn_packet_write_s8(struct nn_packet *packet, s8 v); void nn_packet_write_u8(struct nn_packet *packet, u8 v); -void nn_packet_write_s16(struct nn_packet *packet, s16 v); +void nn_packet_write_s8(struct nn_packet *packet, s8 v); void nn_packet_write_u16(struct nn_packet *packet, u16 v); -void nn_packet_write_s32(struct nn_packet *packet, s32 v); +void nn_packet_write_s16(struct nn_packet *packet, s16 v); void nn_packet_write_u32(struct nn_packet *packet, u32 v); -void nn_packet_write_s64(struct nn_packet *packet, s64 v); +void nn_packet_write_s32(struct nn_packet *packet, s32 v); void nn_packet_write_u64(struct nn_packet *packet, u64 v); +void nn_packet_write_s64(struct nn_packet *packet, s64 v); void nn_packet_write_f32(struct nn_packet *packet, f32 v); void nn_packet_write_f64(struct nn_packet *packet, f64 v); void nn_packet_write_str(struct nn_packet *packet, str *s); void nn_packet_write_buffer(struct nn_packet *packet, struct nn_buffer *buf); bool nn_packet_read_bool(struct nn_packet *packet); -s8 nn_packet_read_s8(struct nn_packet *packet); u8 nn_packet_read_u8(struct nn_packet *packet); u8 nn_packet_peek_u8(struct nn_packet *packet); -s16 nn_packet_read_s16(struct nn_packet *packet); +s8 nn_packet_read_s8(struct nn_packet *packet); u16 nn_packet_read_u16(struct nn_packet *packet); +s16 nn_packet_read_s16(struct nn_packet *packet); +u32 nn_packet_read_u32(struct nn_packet *packet); +u32 nn_packet_peek_u32(struct nn_packet *packet); s32 nn_packet_read_s32(struct nn_packet *packet); s32 nn_packet_peek_s32(struct nn_packet *packet); -u32 nn_packet_read_u32(struct nn_packet *packet); -s64 nn_packet_read_s64(struct nn_packet *packet); u64 nn_packet_read_u64(struct nn_packet *packet); +s64 nn_packet_read_s64(struct nn_packet *packet); f32 nn_packet_read_f32(struct nn_packet *packet); f64 nn_packet_read_f64(struct nn_packet *packet); void nn_packet_read_str(struct nn_packet *packet, str *s); -- cgit v1.2.3-101-g0448