Merge branch 'lukeshu/error'

1 files changed, 12 insertions, 5 deletions

diff --git a/lib9p/core_gen/c_marshal.py b/lib9p/core_gen/c_marshal.py
index bddf55f..86d82e4 100644
--- a/lib9p/core_gen/c_marshal.py
+++ b/lib9p/core_gen/c_marshal.py
@@ -365,7 +365,10 @@ def gen_c_marshal(versions: set[str], typs: list[idl.UserType]) -> str:
         assert isinstance(typ, idl.Struct)
         ret += "\n"
         ret += cutil.ifdef_push(1, c9util.ver_ifdef(typ.in_versions))
-        ret += f"static bool marshal_{typ.typname}(struct lib9p_ctx *ctx, {c9util.typename(typ)} *val, struct _marshal_ret *ret) {{\n"
+        if not isinstance(typ, idl.Message):  # SPECIAL (bool for stat)
+            ret += f"static bool marshal_{typ.typname}(struct lib9p_ctx *ctx, {c9util.typename(typ)} *val, struct _marshal_ret *ret) {{\n"
+        else:
+            ret += f"static error marshal_{typ.typname}(struct lib9p_ctx *ctx, {c9util.typename(typ)} *val, struct _marshal_ret *ret) {{\n"
 
         # Pass 1 - check size
         max_size = max(typ.max_size(v) for v in typ.in_versions)
@@ -380,11 +383,12 @@ def gen_c_marshal(versions: set[str], typs: list[idl.UserType]) -> str:
             ret += "\tif (needed_size > (uint64_t)(ctx->max_msg_size)) {\n"
         else:
             ret += "\tif (needed_size > ctx->max_msg_size) {\n"
-        if isinstance(typ, idl.Message):  # SPECIAL (disable for stat)
-            ret += f'\t\tlib9p_error(ctx, {c9util.IDENT("ERRNO_L_ERANGE")}, "{typ.typname} message too large to marshal into ",\n'
+        if not isinstance(typ, idl.Message):  # SPECIAL (bool for stat)
+            ret += "\t\treturn true;\n"
+        else:
+            ret += f'\t\treturn error_new(E_POSIX_ERANGE, "{typ.typname} message too large to marshal into ",\n'
             ret += f'\t\t\tctx->version ? "negotiated" : "{'client' if typ.msgid % 2 == 0 else 'server'}", " limit",\n'
             ret += '\t\t\t" (", needed_size, " > ", ctx->max_msg_size, ")");\n'
-        ret += "\t\treturn true;\n"
         ret += "\t}\n"
 
         # Pass 2 - write data
@@ -396,7 +400,10 @@ def gen_c_marshal(versions: set[str], typs: list[idl.UserType]) -> str:
                 ret += cutil.ifdef_pop(ifdef_lvl())
 
         # Return
-        ret += "\treturn false;\n"
+        if not isinstance(typ, idl.Message):  # SPECIAL (bool for stat)
+            ret += "\treturn false;\n"
+        else:
+            ret += "\treturn ERROR_NULL;\n"
         ret += "}\n"
     ret += cutil.ifdef_pop(0)
     return ret