lib9p: Unify some tables

1 files changed, 23 insertions, 10 deletions

diff --git a/lib9p/tables.h b/lib9p/tables.h
index 5591e4b..0b642eb 100644
--- a/lib9p/tables.h
+++ b/lib9p/tables.h
@@ -9,8 +9,27 @@
 
 #include <lib9p/9p.h>
 
+/* version ********************************************************************/
+
+struct _lib9p_ver_tentry {
+	const char      *name;
+	uint32_t         min_msg_size;
+};
+
+extern const struct _lib9p_ver_tentry _lib9p_table_ver[LIB9P_VER_NUM];
+
+/* message ********************************************************************/
+
+struct _lib9p_msg_tentry {
+	const char      *name;
+};
+
 typedef ssize_t (*_validate_fn_t)(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes);
 typedef void (*_unmarshal_fn_t)(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
+struct _lib9p_recv_tentry {
+	_validate_fn_t           validate;
+	_unmarshal_fn_t          unmarshal;
+};
 
 struct _marshal_ret {
 	size_t                   net_iov_cnt;
@@ -19,24 +38,18 @@ struct _marshal_ret {
 	uint8_t                 *net_copied;
 };
 typedef bool (*_marshal_fn_t)(struct lib9p_ctx *ctx, void *host_val, struct _marshal_ret *ret);
-
-struct _lib9p_recv_tentry {
-	_validate_fn_t          validate;
-	_unmarshal_fn_t         unmarshal;
-};
-
 struct _lib9p_send_tentry {
-	_marshal_fn_t           marshal;
+	_marshal_fn_t            marshal;
 };
 
-extern const char *const _lib9p_table_ver_name[LIB9P_VER_NUM];
-extern const char *const _lib9p_table_msg_name[LIB9P_VER_NUM][0x100];
-extern const uint32_t _lib9p_table_msg_min_size[LIB9P_VER_NUM];
+extern const struct _lib9p_msg_tentry  _lib9p_table_msg[LIB9P_VER_NUM][0x100];
 extern const struct _lib9p_recv_tentry _lib9p_table_Tmsg_recv[LIB9P_VER_NUM][0x80];
 extern const struct _lib9p_recv_tentry _lib9p_table_Rmsg_recv[LIB9P_VER_NUM][0x80];
 extern const struct _lib9p_send_tentry _lib9p_table_Tmsg_send[LIB9P_VER_NUM][0x80];
 extern const struct _lib9p_send_tentry _lib9p_table_Rmsg_send[LIB9P_VER_NUM][0x80];
 
+/* stat ***********************************************************************/
+
 ssize_t _lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes, uint32_t *ret_net_size);
 void _lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
 bool _lib9p_stat_marshal(struct lib9p_ctx *ctx, struct lib9p_stat *val, struct _marshal_ret *ret);