Version subproject directories

 - Reorder packet functions and add u32 to ext.

Signed-off-by: Andrew Opalach <andrew@akon.city>

8 files changed, 21 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 3de3151..ff9bd9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,12 @@
 .clangd/
 build*/
 compile_commands.json
+subprojects/c89atomic-*/
 subprojects/c89atomic.wrap
-subprojects/jansson/
-subprojects/jsmn/
+subprojects/jansson-*/
+subprojects/jsmn-*/
 subprojects/libalabaster
-subprojects/libcurl/
-subprojects/libev-4.33/
+subprojects/libalabaster/
+subprojects/libcurl-*/
+subprojects/libev-*/
 subprojects/packagecache/
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);
diff --git a/subprojects/jansson.wrap b/subprojects/jansson.wrap
index d274513..a81b524 100644
--- a/subprojects/jansson.wrap
+++ b/subprojects/jansson.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
+directory = jansson-61fc3d0
 url = https://github.com/akheron/jansson.git
 revision = 61fc3d0e28e1a35410af42e329cd977095ec32d2
 depth = 1
diff --git a/subprojects/jsmn.wrap b/subprojects/jsmn.wrap
index ed54ed4..60de972 100644
--- a/subprojects/jsmn.wrap
+++ b/subprojects/jsmn.wrap
@@ -1,8 +1,8 @@
 [wrap-git]
+directory = jsmn-25647e6
 url = https://github.com/zserge/jsmn.git
 revision = 25647e692c7906b96ffd2b05ca54c097948e879c
 depth = 1
-
 patch_directory = jsmn
 
 [provide]
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index 1fec842..cceb244 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libalabaster
-revision = 209310c561d89c9ed2040aa7053b320d32cc393c
+revision = 562c730ac38749fb43ae5b7b53ae5f3043166bd1
 depth = 1
diff --git a/subprojects/libcurl.wrap b/subprojects/libcurl.wrap
index 918eaff..273c519 100644
--- a/subprojects/libcurl.wrap
+++ b/subprojects/libcurl.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
+directory = libcurl-8.11.1
 url = https://github.com/curl/curl.git
 revision = curl-8_11_1
 depth = 1
diff --git a/subprojects/packagefiles/jsmn/meson.build b/subprojects/packagefiles/jsmn/meson.build
index e0bc2ca..7a9032b 100644
--- a/subprojects/packagefiles/jsmn/meson.build
+++ b/subprojects/packagefiles/jsmn/meson.build
@@ -1,2 +1,2 @@
-project('jsmn', 'c', version: 'v1.1.0')
+project('jsmn', 'c', version: 'git-25647e6')
 jsmn = declare_dependency(include_directories: include_directories('.'))