Fix type in print formatting

Author: mikkelfj

CHANGELOG.md

@@ -58,6 +58,7 @@
   using the str_set table for other purposes. (#308).
 - Fix some GCC indentation warnings in generated code - warnings are
   disabled in build already, but this may help some users (#313).
+- Fix %d vs uint32 type in some printformatting (#315).
 
 ## [0.6.1]
 

src/compiler/codegen_c_json_printer.c

@@ -301,8 +301,8 @@ static int gen_json_printer_struct(fb_output_t *out, fb_compound_type_t *ct)
             tp = scalar_type_prefix(member->type.st);
             fprintf(
                     out->fp,
-                    "    flatcc_json_printer_%s_array_struct_field(ctx, %d, p, %"PRIu64", \"%.*s\", %ld, %d);\n",
-                    tp, index, (uint64_t)member->offset, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->type.len);
+                    "    flatcc_json_printer_%s_array_struct_field(ctx, %d, p, %"PRIu64", \"%.*s\", %ld, %"PRIu64");\n",
+                    tp, index, (uint64_t)member->offset, (int)sym->ident->len, sym->ident->text, sym->ident->len, (uint64_t)member->type.len);
             break;
         case vt_fixed_array_compound_type_ref:
             fb_compound_name(member->type.ct, &snref);
@@ -311,8 +311,8 @@ static int gen_json_printer_struct(fb_output_t *out, fb_compound_type_t *ct)
 #if FLATCC_JSON_PRINT_MAP_ENUMS
                 tp = scalar_type_prefix(member->type.ct->type.st);
                 fprintf(out->fp,
-                        "    flatcc_json_printer_%s_enum_array_struct_field(ctx, %d, p, %"PRIu64", \"%.*s\", %ld, %d, %s_print_json_enum);\n",
-                        tp, index, (uint64_t)member->offset, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->type.len, snref.text);
+                        "    flatcc_json_printer_%s_enum_array_struct_field(ctx, %d, p, %"PRIu64", \"%.*s\", %ld, %"PRIu64", %s_print_json_enum);\n",
+                        tp, index, (uint64_t)member->offset, (int)sym->ident->len, sym->ident->text, sym->ident->len, (uint64_t)member->type.len, snref.text);
                 break;
 #else
                 tp = scalar_type_prefix(member->type.ct->type.st);

src/compiler/codegen_c_reader.c

@@ -1294,8 +1294,8 @@ static void gen_struct(fb_output_t *out, fb_compound_type_t *ct)
             tname = scalar_type_name(member->type.st);
             tname_prefix = scalar_type_prefix(member->type.st);
             fprintf(out->fp,
-                "__%sdefine_struct_scalar_fixed_array_field(%s, %.*s, %s%s, %s%s, %d)\n",
-                nsc, snt.text, n, s, nsc, tname_prefix, tname_ns, tname, member->type.len);
+                "__%sdefine_struct_scalar_fixed_array_field(%s, %.*s, %s%s, %s%s, %"PRIu64")\n",
+                nsc, snt.text, n, s, nsc, tname_prefix, tname_ns, tname, (uint64_t)member->type.len);
             /* TODO: if member->type.st == fb_char add string specific methods. */
             break;
         case vt_scalar_type:
@@ -1344,13 +1344,13 @@ static void gen_struct(fb_output_t *out, fb_compound_type_t *ct)
             switch (member->type.ct->symbol.kind) {
             case fb_is_enum:
                 fprintf(out->fp,
-                    "__%sdefine_struct_scalar_fixed_array_field(%s, %.*s, %s, %s_enum_t, %d)\n",
-                    nsc, snt.text, n, s, snref.text, snref.text, member->type.len);
+                    "__%sdefine_struct_scalar_fixed_array_field(%s, %.*s, %s, %s_enum_t, %"PRIu64")\n",
+                    nsc, snt.text, n, s, snref.text, snref.text, (uint64_t)member->type.len);
                 break;
             case fb_is_struct:
                 fprintf(out->fp,
-                    "__%sdefine_struct_struct_fixed_array_field(%s, %.*s, %s_struct_t, %d)\n",
-                    nsc, snt.text, n, s, snref.text, member->type.len);
+                    "__%sdefine_struct_struct_fixed_array_field(%s, %.*s, %s_struct_t, %"PRIu64")\n",
+                    nsc, snt.text, n, s, snref.text, (uint64_t)member->type.len);
                 break;
             }
             break;