diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-05 18:11:02 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-05 18:11:02 +0100 |
| commit | efccbf6f276b8fdf7caccebd0817558b87db5038 (patch) | |
| tree | 1807c3e7a6e8ae5228ce5c9e1af2310a5f7a5c61 | |
| parent | 327a3e2faae634d5910513f79c9d11b9ecf467c6 (diff) | |
| parent | 64ef5d7f4eefeecb8ee554cbaf1f9641b35a88bf (diff) | |
| download | micropython-efccbf6f276b8fdf7caccebd0817558b87db5038.tar.gz micropython-efccbf6f276b8fdf7caccebd0817558b87db5038.zip | |
Merge pull request #436 from dhylands/pfenv-print-int
Change pfenv_print_int to take machine_uint_t rather than unsinged in
| -rw-r--r-- | py/pfenv.c | 4 | ||||
| -rw-r--r-- | py/pfenv.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/py/pfenv.c b/py/pfenv.c index 7ce721aca1..0d6fab3c48 100644 --- a/py/pfenv.c +++ b/py/pfenv.c @@ -79,10 +79,10 @@ int pfenv_print_strn(const pfenv_t *pfenv, const char *str, unsigned int len, in // We can use 16 characters for 32-bit and 32 characters for 64-bit #define INT_BUF_SIZE (sizeof(machine_int_t) * 4) -int pfenv_print_int(const pfenv_t *pfenv, unsigned int x, int sgn, int base, int base_char, int flags, char fill, int width) { +int pfenv_print_int(const pfenv_t *pfenv, machine_uint_t x, int sgn, int base, int base_char, int flags, char fill, int width) { char sign = 0; if (sgn) { - if ((int)x < 0) { + if ((machine_int_t)x < 0) { sign = '-'; x = -x; } else if (flags & PF_FLAG_SHOW_SIGN) { diff --git a/py/pfenv.h b/py/pfenv.h index edceaf3e4e..36b452b91c 100644 --- a/py/pfenv.h +++ b/py/pfenv.h @@ -17,7 +17,7 @@ typedef struct _pfenv_t { void pfenv_vstr_add_strn(void *data, const char *str, unsigned int len); int pfenv_print_strn(const pfenv_t *pfenv, const char *str, unsigned int len, int flags, char fill, int width); -int pfenv_print_int(const pfenv_t *pfenv, unsigned int x, int sgn, int base, int base_char, int flags, char fill, int width); +int pfenv_print_int(const pfenv_t *pfenv, machine_uint_t x, int sgn, int base, int base_char, int flags, char fill, int width); #if MICROPY_ENABLE_FLOAT int pfenv_print_float(const pfenv_t *pfenv, mp_float_t f, char fmt, int flags, char fill, int width, int prec); #endif |