lib9p: Remove uses of printf

1 files changed, 9 insertions, 11 deletions

diff --git a/lib9p/core_gen/c_validate.py b/lib9p/core_gen/c_validate.py
index 3073ed0..9c55d8d 100644
--- a/lib9p/core_gen/c_validate.py
+++ b/lib9p/core_gen/c_validate.py
@@ -59,7 +59,7 @@ def gen_c_validate(versions: set[str], typs: list[idl.UserType]) -> str:
         "\t\t * that.  */\n"
         f'\t\treturn lib9p_error(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "message is too short for content");\n'
         "\tif (net_offset > net_size)\n"
-        f'\t\treturn lib9p_errorf(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "message is too short for content (%"PRIu32" > %"PRIu32") @ %d", net_offset, net_size, __LINE__);\n'
+        f'\t\treturn lib9p_error(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "message is too short for content (", net_offset, " > ", net_size, ")");\n'
     )
     ret += cutil.macro(
         "#define VALIDATE_NET_UTF8(n)\n"
@@ -190,11 +190,10 @@ def gen_c_validate(versions: set[str], typs: list[idl.UserType]) -> str:
                 for tok in child.val.tokens
             ):
                 nbits = 32
-            act = f"(uint{nbits}_t)GET_U{nbits}LE({lookup_sym(f'&{child.membname}')})"
-            exp = f"(uint{nbits}_t)({c9util.idl_expr(child.val, lookup_sym)})"
+            act = f"GET_U{nbits}LE({lookup_sym(f'&{child.membname}')})"
+            exp = f"{c9util.idl_expr(child.val, lookup_sym)}"
             ret += f"{'\t'*indent_lvl()}if ({act} != {exp})\n"
-            ret += f'{"\t"*(indent_lvl()+1)}return lib9p_errorf(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "{path} value is wrong: actual: %"PRIu{nbits}" != correct:%"PRIu{nbits},\n'
-            ret += f"{'\t'*(indent_lvl()+2)}{act}, {exp});\n"
+            ret += f'{"\t"*(indent_lvl()+1)}return lib9p_error(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "{path} value is wrong: actual:", (base10, {act}), " != correct:", (base10, {exp}));\n'
         if child.max:
             incr_flush()
             assert child.typ.static_size
@@ -205,19 +204,18 @@ def gen_c_validate(versions: set[str], typs: list[idl.UserType]) -> str:
                 for tok in child.max.tokens
             ):
                 nbits = 32
-            act = f"(uint{nbits}_t)GET_U{nbits}LE({lookup_sym(f'&{child.membname}')})"
-            exp = f"(uint{nbits}_t)({c9util.idl_expr(child.max, lookup_sym)})"
+            act = f"GET_U{nbits}LE({lookup_sym(f'&{child.membname}')})"
+            exp = f"{c9util.idl_expr(child.max, lookup_sym)}"
             ret += f"{'\t'*indent_lvl()}if ({act} > {exp})\n"
-            ret += f'{"\t"*(indent_lvl()+1)}return lib9p_errorf(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "{path} value is too large: %"PRIu{nbits}" > %"PRIu{nbits},\n'
-            ret += f"{'\t'*(indent_lvl()+2)}{act}, {exp});\n"
+            ret += f'{"\t"*(indent_lvl()+1)}return lib9p_error(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "{path} value is too large: ", (base10, {act}), " > ", (base10, {exp}));\n'
         if isinstance(child.typ, idl.Bitfield):
             incr_flush()
             nbytes = child.typ.static_size
             nbits = nbytes * 8
             act = f"GET_U{nbits}LE({lookup_sym(f'&{child.membname}')})"
             ret += f"{'\t'*indent_lvl()}if ({act} & ~{child.typ.typname}_masks[ctx->version])\n"
-            ret += f'{"\t"*(indent_lvl()+1)}return lib9p_errorf(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "unknown bits in {child.typ.typname} bitfield: %#0{nbytes*2}"PRIx{nbits},\n'
-            ret += f"{'\t'*(indent_lvl()+2)}{act} & ~{child.typ.typname}_masks[ctx->version]);\n"
+            ret += f'{"\t"*(indent_lvl()+1)}return lib9p_error(ctx, {c9util.IDENT("ERRNO_L_EBADMSG")}, "unknown bits in {child.typ.typname} bitfield: ",\n'
+            ret += f"{'\t'*(indent_lvl()+2)}(base16_u{nbits}_, {act} & ~{child.typ.typname}_masks[ctx->version]));\n"
 
     def handle(
         path: idlutil.Path,