diff options
| -rw-r--r-- | unix/coverage.c | 40 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/unix/coverage.c b/unix/coverage.c index d6514b9cff..94d0ad4cae 100644 --- a/unix/coverage.c +++ b/unix/coverage.c @@ -11,7 +11,7 @@ STATIC mp_obj_t extra_coverage(void) { // mp_printf (used by ports that don't have a native printf) { - printf("# mp_printf\n"); + mp_printf(&mp_plat_print, "# mp_printf\n"); mp_printf(&mp_plat_print, "%"); // nothing after percent mp_printf(&mp_plat_print, "%d %+d % d\n", -123, 123, 123); // sign mp_printf(&mp_plat_print, "%05d\n", -123); // negative number with zero padding @@ -26,67 +26,67 @@ STATIC mp_obj_t extra_coverage(void) { // vstr { - printf("# vstr\n"); + mp_printf(&mp_plat_print, "# vstr\n"); vstr_t *vstr = vstr_new_size(16); vstr_hint_size(vstr, 32); vstr_add_str(vstr, "ts"); vstr_ins_byte(vstr, 1, 'e'); vstr_ins_char(vstr, 3, 't'); vstr_ins_char(vstr, 10, 's'); - printf("%.*s\n", (int)vstr->len, vstr->buf); + mp_printf(&mp_plat_print, "%.*s\n", (int)vstr->len, vstr->buf); vstr_cut_head_bytes(vstr, 2); - printf("%.*s\n", (int)vstr->len, vstr->buf); + mp_printf(&mp_plat_print, "%.*s\n", (int)vstr->len, vstr->buf); vstr_cut_tail_bytes(vstr, 10); - printf("%.*s\n", (int)vstr->len, vstr->buf); + mp_printf(&mp_plat_print, "%.*s\n", (int)vstr->len, vstr->buf); vstr_printf(vstr, "t%cst", 'e'); - printf("%.*s\n", (int)vstr->len, vstr->buf); + mp_printf(&mp_plat_print, "%.*s\n", (int)vstr->len, vstr->buf); vstr_cut_out_bytes(vstr, 3, 10); - printf("%.*s\n", (int)vstr->len, vstr->buf); + mp_printf(&mp_plat_print, "%.*s\n", (int)vstr->len, vstr->buf); VSTR_FIXED(fix, 4); vstr_add_str(&fix, "large"); - printf("%.*s\n", (int)fix.len, fix.buf); + mp_printf(&mp_plat_print, "%.*s\n", (int)fix.len, fix.buf); } // repl autocomplete { - printf("# repl\n"); + mp_printf(&mp_plat_print, "# repl\n"); const char *str; mp_uint_t len = mp_repl_autocomplete("__n", 3, &mp_plat_print, &str); - printf("%.*s\n", (int)len, str); + mp_printf(&mp_plat_print, "%.*s\n", (int)len, str); mp_store_global(MP_QSTR_sys, mp_import_name(MP_QSTR_sys, mp_const_none, MP_OBJ_NEW_SMALL_INT(0))); mp_repl_autocomplete("sys.", 4, &mp_plat_print, &str); len = mp_repl_autocomplete("sys.impl", 8, &mp_plat_print, &str); - printf("%.*s\n", (int)len, str); + mp_printf(&mp_plat_print, "%.*s\n", (int)len, str); } // attrtuple { - printf("# attrtuple\n"); + mp_printf(&mp_plat_print, "# attrtuple\n"); static const qstr fields[] = {MP_QSTR_start, MP_QSTR_stop, MP_QSTR_step}; static const mp_obj_t items[] = {MP_OBJ_NEW_SMALL_INT(1), MP_OBJ_NEW_SMALL_INT(2), MP_OBJ_NEW_SMALL_INT(3)}; mp_obj_print_helper(&mp_plat_print, mp_obj_new_attrtuple(fields, 3, items), PRINT_REPR); - printf("\n"); + mp_printf(&mp_plat_print, "\n"); } // str { - printf("# str\n"); + mp_printf(&mp_plat_print, "# str\n"); // intern string - printf("%d\n", MP_OBJ_IS_QSTR(mp_obj_str_intern(mp_obj_new_str("intern me", 9, false)))); + mp_printf(&mp_plat_print, "%d\n", MP_OBJ_IS_QSTR(mp_obj_str_intern(mp_obj_new_str("intern me", 9, false)))); } // mpz { - printf("# mpz\n"); + mp_printf(&mp_plat_print, "# mpz\n"); mp_uint_t value; mpz_t mpz; @@ -94,17 +94,17 @@ STATIC mp_obj_t extra_coverage(void) { // mpz_as_uint_checked, with success mpz_set_from_int(&mpz, 12345678); - printf("%d\n", mpz_as_uint_checked(&mpz, &value)); - printf("%d\n", (int)value); + mp_printf(&mp_plat_print, "%d\n", mpz_as_uint_checked(&mpz, &value)); + mp_printf(&mp_plat_print, "%d\n", (int)value); // mpz_as_uint_checked, with negative arg mpz_set_from_int(&mpz, -1); - printf("%d\n", mpz_as_uint_checked(&mpz, &value)); + mp_printf(&mp_plat_print, "%d\n", mpz_as_uint_checked(&mpz, &value)); // mpz_as_uint_checked, with overflowing arg mpz_set_from_int(&mpz, 1); mpz_shl_inpl(&mpz, &mpz, 70); - printf("%d\n", mpz_as_uint_checked(&mpz, &value)); + mp_printf(&mp_plat_print, "%d\n", mpz_as_uint_checked(&mpz, &value)); } return mp_const_none; diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index df7fa804e3..7deef4fdc7 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -192,7 +192,7 @@ void mp_unix_mark_exec(void); #define MP_PLAT_FREE_EXEC(ptr, size) mp_unix_free_exec(ptr, size) #include <unistd.h> -#define MP_PLAT_PRINT_STRN(str, len) write(1, str, len) +#define MP_PLAT_PRINT_STRN(str, len) do { ssize_t ret = write(1, str, len); (void)ret; } while (0) #ifdef __linux__ // Can access physical memory using /dev/mem |