diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2024-04-09 11:15:05 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2024-04-09 11:15:05 -0400 |
| commit | 3d1ab87859a291cf8965b56703931193d5e6ae25 (patch) | |
| tree | d943ee5fa900c3cc041142631c1c564bba4ab01e /src/util | |
| parent | 953dcd1da1ba35ecab7e2955aed3967e95640cff (diff) | |
| download | libnaunet-3d1ab87859a291cf8965b56703931193d5e6ae25.tar.gz libnaunet-3d1ab87859a291cf8965b56703931193d5e6ae25.tar.bz2 libnaunet-3d1ab87859a291cf8965b56703931193d5e6ae25.zip | |
Update str usage, add macro for getting packet id
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/file/file_linux.c | 2 | ||||
| -rw-r--r-- | src/util/packet.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/util/file/file_linux.c b/src/util/file/file_linux.c index f916e0b..403d685 100644 --- a/src/util/file/file_linux.c +++ b/src/util/file/file_linux.c @@ -214,7 +214,7 @@ bool aki_dir_read(struct aki_dir *dir, struct aki_dir_entry *entry) entry->type = AKI_ENTRY_OTHER; break; } - al_str_clone(&entry->name, al_str_c(entry->entry->d_name)); + al_str_clone(&entry->name, al_str_cr(entry->entry->d_name)); al_str_clone(&entry->path, &dir->path); al_str_cat(&entry->path, al_str_c("/")); al_str_cat(&entry->path, &entry->name); diff --git a/src/util/packet.h b/src/util/packet.h index c6b4235..f877c72 100644 --- a/src/util/packet.h +++ b/src/util/packet.h @@ -16,6 +16,9 @@ struct aki_packet { void *userdata; }; +#define AKI_PACKET_GET_ID(p) \ + *((u32 *)aki_buffer_get_ptr(&p->buffer, AKI_PACKET_HEADER_LENGTH + sizeof(s8))) + #define AKI_PACKET_WRITE_TYPE(p, type, v) \ aki_buffer_write(&(p)->buffer, &(v), (p)->windex, sizeof(type)); \ (p)->windex += (u32)sizeof(type) @@ -48,6 +51,7 @@ void aki_packet_write_u32(struct aki_packet *packet, u32 v); void aki_packet_write_s64(struct aki_packet *packet, s64 v); void aki_packet_write_u64(struct aki_packet *packet, u64 v); void aki_packet_write_f32(struct aki_packet *packet, f32 v); +void aki_packet_write_f64(struct aki_packet *packet, f64 v); void aki_packet_write_str(struct aki_packet *packet, str *s); void aki_packet_write_wstr(struct aki_packet *packet, wstr *w); void aki_packet_write_buffer(struct aki_packet *packet, struct aki_buffer *buf); @@ -61,6 +65,7 @@ u32 aki_packet_read_u32(struct aki_packet *packet); s64 aki_packet_read_s64(struct aki_packet *packet); u64 aki_packet_read_u64(struct aki_packet *packet); f32 aki_packet_read_f32(struct aki_packet *packet); +f64 aki_packet_read_f64(struct aki_packet *packet); void aki_packet_read_str(struct aki_packet *packet, str *s); void aki_packet_read_wstr(struct aki_packet *packet, wstr *w); void aki_packet_read_buffer(struct aki_packet *packet, struct aki_buffer *buf); |