py: Fix passing of some wide int types to printf varg format list.

dpgeorge · dpgeorge · commit 2a1cca20b1e1 · 2016-03-14T22:40:39.000Z
Passing an mp_uint_t to a %d printf format is incorrect for builds where
mp_uint_t is larger than word size (eg a nanboxing build).  This patch
adds some simple casting to int in these cases.
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
@@ -370,7 +370,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
             "ord expects a character"));
     } else {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
-            "ord() expected a character, but string of length %d found", len));
+            "ord() expected a character, but string of length %d found", (int)len));
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_ord_obj, mp_builtin_ord);
diff --git a/py/obj.c b/py/obj.c
@@ -342,7 +342,7 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, mp_uint_t len, mp_obj_t **items) {
                 "tuple/list has wrong length"));
         } else {
             nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-                "requested length %d but object has length %d", len, seq_len));
+                "requested length %d but object has length %d", (int)len, (int)seq_len));
         }
     }
 }
diff --git a/py/objclosure.c b/py/objclosure.c
@@ -65,7 +65,7 @@ STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_
     mp_obj_closure_t *o = MP_OBJ_TO_PTR(o_in);
     mp_print_str(print, "<closure ");
     mp_obj_print_helper(print, o->fun, PRINT_REPR);
-    mp_printf(print, " at %p, n_closed=%u ", o, o->n_closed);
+    mp_printf(print, " at %p, n_closed=%u ", o, (int)o->n_closed);
     for (mp_uint_t i = 0; i < o->n_closed; i++) {
         if (o->closed[i] == MP_OBJ_NULL) {
             mp_print_str(print, "(nil)");
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
@@ -79,7 +79,7 @@ STATIC void namedtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 
 STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     const mp_obj_namedtuple_type_t *type = (const mp_obj_namedtuple_type_t*)type_in;
-    mp_uint_t num_fields = type->n_fields;
+    size_t num_fields = type->n_fields;
     if (n_args + n_kw != num_fields) {
         if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
             mp_arg_error_terse_mismatch();
diff --git a/py/runtime.c b/py/runtime.c
@@ -788,15 +788,15 @@ void mp_unpack_sequence(mp_obj_t seq_in, mp_uint_t num, mp_obj_t *items) {
             "wrong number of values to unpack"));
     } else {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-            "need more than %d values to unpack", seq_len));
+            "need more than %d values to unpack", (int)seq_len));
     }
 too_long:
     if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
         nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
             "wrong number of values to unpack"));
     } else {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-            "too many values to unpack (expected %d)", num));
+            "too many values to unpack (expected %d)", (int)num));
     }
 }
 
@@ -863,7 +863,7 @@ void mp_unpack_ex(mp_obj_t seq_in, mp_uint_t num_in, mp_obj_t *items) {
             "wrong number of values to unpack"));
     } else {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-            "need more than %d values to unpack", seq_len));
+            "need more than %d values to unpack", (int)seq_len));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {`
`370`	`370`	`"ord expects a character"));`
`371`	`371`	`} else {`
`372`	`372`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
`373`		`- "ord() expected a character, but string of length %d found", len));`
	`373`	`+ "ord() expected a character, but string of length %d found", (int)len));`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`	`MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_ord_obj, mp_builtin_ord);`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, mp_uint_t len, mp_obj_t **items) {`
`342`	`342`	`"tuple/list has wrong length"));`
`343`	`343`	`} else {`
`344`	`344`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,`
`345`		`- "requested length %d but object has length %d", len, seq_len));`
	`345`	`+ "requested length %d but object has length %d", (int)len, (int)seq_len));`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -788,15 +788,15 @@ void mp_unpack_sequence(mp_obj_t seq_in, mp_uint_t num, mp_obj_t *items) {`
`788`	`788`	`"wrong number of values to unpack"));`
`789`	`789`	`} else {`
`790`	`790`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,`
`791`		`- "need more than %d values to unpack", seq_len));`
	`791`	`+ "need more than %d values to unpack", (int)seq_len));`
`792`	`792`	`}`
`793`	`793`	`too_long:`
`794`	`794`	`if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {`
`795`	`795`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,`
`796`	`796`	`"wrong number of values to unpack"));`
`797`	`797`	`} else {`
`798`	`798`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,`
`799`		`- "too many values to unpack (expected %d)", num));`
	`799`	`+ "too many values to unpack (expected %d)", (int)num));`
`800`	`800`	`}`
`801`	`801`	`}`
`802`	`802`
`@@ -863,7 +863,7 @@ void mp_unpack_ex(mp_obj_t seq_in, mp_uint_t num_in, mp_obj_t *items) {`
`863`	`863`	`"wrong number of values to unpack"));`
`864`	`864`	`} else {`
`865`	`865`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,`
`866`		`- "need more than %d values to unpack", seq_len));`
	`866`	`+ "need more than %d values to unpack", (int)seq_len));`
`867`	`867`	`}`
`868`	`868`	`}`
`869`	`869`