summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-03-14 22:32:40 +0000
committerDamien George <damien.p.george@gmail.com>2015-03-14 22:32:40 +0000
commitfa1edff006ced6f2e4b4ba4f899809c0d2a63de0 (patch)
treead36675969951bcee0d3381acfa5962bbf43b189
parent6837d46c1da0e7dd9cf73969bb58649222f455a4 (diff)
downloadmicropython-fa1edff006ced6f2e4b4ba4f899809c0d2a63de0.tar.gz
micropython-fa1edff006ced6f2e4b4ba4f899809c0d2a63de0.zip
py: Remove unnecessary and unused sgn argument from pfenv_print_mp_int.
-rw-r--r--py/objstr.c14
-rw-r--r--py/pfenv.c4
-rw-r--r--py/pfenv.h2
3 files changed, 9 insertions, 11 deletions
diff --git a/py/objstr.c b/py/objstr.c
index 9baaedf18d..c39f23db50 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1083,7 +1083,7 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
if (arg_looks_integer(arg)) {
switch (type) {
case 'b':
- pfenv_print_mp_int(&pfenv_vstr, arg, 1, 2, 'a', flags, fill, width, 0);
+ pfenv_print_mp_int(&pfenv_vstr, arg, 2, 'a', flags, fill, width, 0);
continue;
case 'c':
@@ -1096,7 +1096,7 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
case '\0': // No explicit format type implies 'd'
case 'n': // I don't think we support locales in uPy so use 'd'
case 'd':
- pfenv_print_mp_int(&pfenv_vstr, arg, 1, 10, 'a', flags, fill, width, 0);
+ pfenv_print_mp_int(&pfenv_vstr, arg, 10, 'a', flags, fill, width, 0);
continue;
case 'o':
@@ -1104,12 +1104,12 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
flags |= PF_FLAG_SHOW_OCTAL_LETTER;
}
- pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, 0);
+ pfenv_print_mp_int(&pfenv_vstr, arg, 8, 'a', flags, fill, width, 0);
continue;
case 'X':
case 'x':
- pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, type - ('X' - 'A'), flags, fill, width, 0);
+ pfenv_print_mp_int(&pfenv_vstr, arg, 16, type - ('X' - 'A'), flags, fill, width, 0);
continue;
case 'e':
@@ -1377,7 +1377,7 @@ not_enough_args:
case 'd':
case 'i':
case 'u':
- pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width, prec);
+ pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 10, 'a', flags, fill, width, prec);
break;
#if MICROPY_PY_BUILTINS_FLOAT
@@ -1395,7 +1395,7 @@ not_enough_args:
if (alt) {
flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
}
- pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width, prec);
+ pfenv_print_mp_int(&pfenv_vstr, arg, 8, 'a', flags, fill, width, prec);
break;
case 'r':
@@ -1419,7 +1419,7 @@ not_enough_args:
case 'X':
case 'x':
- pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
+ pfenv_print_mp_int(&pfenv_vstr, arg, 16, *str - ('X' - 'A'), flags | alt, fill, width, prec);
break;
default:
diff --git a/py/pfenv.c b/py/pfenv.c
index 8bc42dcdf9..22274a2ad7 100644
--- a/py/pfenv.c
+++ b/py/pfenv.c
@@ -178,9 +178,7 @@ int pfenv_print_int(const pfenv_t *pfenv, mp_uint_t x, int sgn, int base, int ba
return len;
}
-int pfenv_print_mp_int(const pfenv_t *pfenv, mp_obj_t x, int sgn, int base, int base_char, int flags, char fill, int width, int prec) {
- (void)sgn; // TODO why is sgn unused?
-
+int pfenv_print_mp_int(const pfenv_t *pfenv, mp_obj_t x, int base, int base_char, int flags, char fill, int width, int prec) {
if (!MP_OBJ_IS_INT(x)) {
// This will convert booleans to int, or raise an error for
// non-integer types.
diff --git a/py/pfenv.h b/py/pfenv.h
index 01258f8202..3d2b31b5d0 100644
--- a/py/pfenv.h
+++ b/py/pfenv.h
@@ -51,7 +51,7 @@ void pfenv_vstr_add_strn(void *data, const char *str, mp_uint_t len);
int pfenv_print_strn(const pfenv_t *pfenv, const char *str, mp_uint_t len, int flags, char fill, int width);
int pfenv_print_int(const pfenv_t *pfenv, mp_uint_t x, int sgn, int base, int base_char, int flags, char fill, int width);
-int pfenv_print_mp_int(const pfenv_t *pfenv, mp_obj_t x, int sgn, int base, int base_char, int flags, char fill, int width, int prec);
+int pfenv_print_mp_int(const pfenv_t *pfenv, mp_obj_t x, int base, int base_char, int flags, char fill, int width, int prec);
#if MICROPY_PY_BUILTINS_FLOAT
int pfenv_print_float(const pfenv_t *pfenv, mp_float_t f, char fmt, int flags, char fill, int width, int prec);
#endif