Merge branch 'lukeshu/error'HEADmain

1 files changed, 21 insertions, 58 deletions

diff --git a/lib9p/core_include/lib9p/core.h b/lib9p/core_include/lib9p/core.h
index 27553a3..9d92312 100644
--- a/lib9p/core_include/lib9p/core.h
+++ b/lib9p/core_include/lib9p/core.h
@@ -20,11 +20,6 @@
 
 #include <lib9p/_core_generated.h> /* _after_ other includes, including config.h */
 
-#ifndef CONFIG_9P_MAX_ERR_SIZE
-	#error config.h must define CONFIG_9P_MAX_ERR_SIZE
-#endif
-static_assert(CONFIG_9P_MAX_ERR_SIZE <= UINT16_MAX);
-
 /* constants ******************************************************************/
 
 enum {
@@ -49,40 +44,8 @@ struct lib9p_ctx {
 	/* negotiated */
 	enum lib9p_version      version;
 	uint32_t                max_msg_size;
-
-	/* state */
-#if CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_9P2000_L
-	lib9p_errno_t           err_num;
-#endif
-	[[gnu::nonstring]] char err_msg[CONFIG_9P_MAX_ERR_SIZE];
 };
 
-void lib9p_ctx_clear_error(struct lib9p_ctx *ctx);
-
-bool lib9p_ctx_has_error(struct lib9p_ctx *ctx);
-
-#if CONFIG_9P_ENABLE_9P2000_u || CONFIG_9P_ENABLE_9P2000_L
-	#define _lib9p_set_err_num(ctx, linux_errno) do { (ctx)->err_num = linux_errno; } while (0)
-#else
-	#define _lib9p_set_err_num(ctx, linux_errno) do { } while (0)
-#endif
-
-/** Write a <libmisc/fmt.h>-style error into ctx, return -1.  */
-#define lib9p_error(ctx, linux_errno, ...) ({                        \
-	if (!lib9p_ctx_has_error(ctx)) {                             \
-		_lib9p_set_err_num(ctx, linux_errno);                \
-		struct fmt_buf _w = {                                \
-			.dat = (ctx)->err_msg,                       \
-			.cap = sizeof((ctx)->err_msg),               \
-		};                                                   \
-		lo_interface fmt_dest w = LO_BOX(fmt_dest, &_w);     \
-		fmt_print(w, __VA_ARGS__);                           \
-		if (_w.len < _w.cap)                                 \
-			memset(_w.dat + _w.len, 0, _w.cap - _w.len); \
-	}                                                            \
-	-1;                                                          \
-})
-
 /* misc utilities *************************************************************/
 
 uint32_t lib9p_version_min_Rerror_size(enum lib9p_version);
@@ -100,19 +63,19 @@ void fmt_print_lib9p_msg(lo_interface fmt_dest w, struct lib9p_ctx *ctx, enum li
  * number may be larger than net_bytes due to (1) struct padding, (2)
  * array pointers.
  *
- * @param ctx : negotiated protocol parameters, where to record errors
+ * @param ctx : negotiated protocol parameters
  * @param net_bytes : the complete request, starting with the "size[4]"
  *
- * @return required size, or -1 on error
+ * @return required size, or an error
  *
- * @errno L_EOPNOTSUPP: message is an R-message
- * @errno L_EOPNOTSUPP: message has unknown type
- * @errno L_EBADMSG: message is wrong size for content
- * @errno L_EILSEQ: message contains invalid UTF-8, or the UTF-8 contains a nul-byte
- * @errno L_EBADMSG: message contains a bitfield with unknown bits
- * @errno L_EMSGSIZE: would-be return value overflows SSIZE_MAX
+ * @errno E_POSIX_EOPNOTSUPP: message is an R-message
+ * @errno E_POSIX_EOPNOTSUPP: message has unknown type
+ * @errno E_POSIX_EBADMSG: message is wrong size for content
+ * @errno E_POSIX_EILSEQ: message contains invalid UTF-8, or the UTF-8 contains a nul-byte
+ * @errno E_POSIX_EBADMSG: message contains a bitfield with unknown bits
+ * @errno E_POSIX_EMSGSIZE: would-be return value overflows SSIZE_MAX
  */
-ssize_t lib9p_Tmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes);
+size_t_or_error lib9p_Tmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes);
 
 /**
  * Unmarshal the 9P message `net_bytes` into the C struct `ret_body`.
@@ -138,27 +101,27 @@ void lib9p_Tmsg_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
  * marshal bitfield bits that aren't in ctx->version; it applies a
  * version-specific mask to bitfields.
  *
- * @param ctx : negotiated protocol parameters, where to record errors
+ * @param ctx : negotiated protocol parameters
  * @param typ : the message type
  * @param msg : the message to encode (`struct lib9p_msg_XXXX` according to `typ`)
  *
  * @return ret : the buffer to encode to
- * @return whether there was an error (false=success, true=error)
+ * @return error
  *
- * @errno L_ERANGE: reply does not fit in ctx->max_msg_size
+ * @errno E_POSIX_ERANGE: reply does not fit in ctx->max_msg_size
  */
-bool lib9p_Tmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
-                        struct lib9p_Tmsg_send_buf *ret);
+error lib9p_Tmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
+                              struct lib9p_Tmsg_send_buf *ret);
 
 /* main R-message functions ***************************************************/
 
 /** Same as above, but for R-messages instead of T-messages.  */
 
-ssize_t lib9p_Rmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes);
+size_t_or_error lib9p_Rmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes);
 void lib9p_Rmsg_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
                           enum lib9p_msg_type *ret_typ, void *ret_body);
-bool lib9p_Rmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
-                        struct lib9p_Rmsg_send_buf *ret);
+error lib9p_Rmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
+                         struct lib9p_Rmsg_send_buf *ret);
 
 
 /* `struct lib9p_stat` helpers ************************************************/
@@ -170,16 +133,16 @@ void fmt_print_lib9p_stat(lo_interface fmt_dest w, struct lib9p_ctx *ctx, struct
 /**
  * Validate a message's `stat` structure.
  *
- * @param ctx : negotiated protocol parameters, where to record errors
+ * @param ctx : negotiated protocol parameters
  * @param net_bytes : network-encoded stat structure
  * @param net_size : the number of net_bytes that may be read
  *
  * @return ret_net_size : number of bytes consumed; <=net_size
  * @return ret_host_size : number of bytes that lib9p_stat_unmarshal would take
- * @return whether there was an error
+ * @return error
  */
-bool lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes,
-                         uint32_t *ret_net_size, size_t *ret_host_size);
+error lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes,
+                          uint32_t *ret_net_size, size_t *ret_host_size);
 
 /**
  * Unmarshal the 9P `net_bytes` into the C struct `ret_obj`.