From 6ed77bedbded21f4f3513b21fbb8b17a1f3e709e Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 16 Feb 2017 15:59:51 +1100
Subject: [PATCH] py/mpz: Change type of "base" args from mp_uint_t to unsigned
int.
---
py/mpz.c | 8 ++++----
py/mpz.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/py/mpz.c b/py/mpz.c
index 1090d58c7..72d226cb3 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -705,7 +705,7 @@ mpz_t *mpz_from_float(mp_float_t val) {
}
#endif
-mpz_t *mpz_from_str(const char *str, size_t len, bool neg, mp_uint_t base) {
+mpz_t *mpz_from_str(const char *str, size_t len, bool neg, unsigned int base) {
mpz_t *z = mpz_zero();
mpz_set_from_str(z, str, len, neg, base);
return z;
@@ -873,7 +873,7 @@ typedef uint32_t mp_float_int_t;
#endif
// returns number of bytes from str that were processed
-size_t mpz_set_from_str(mpz_t *z, const char *str, size_t len, bool neg, mp_uint_t base) {
+size_t mpz_set_from_str(mpz_t *z, const char *str, size_t len, bool neg, unsigned int base) {
assert(base <= 36);
const char *cur = str;
@@ -1676,7 +1676,7 @@ mp_float_t mpz_as_float(const mpz_t *i) {
#if 0
this function is unused
-char *mpz_as_str(const mpz_t *i, mp_uint_t base) {
+char *mpz_as_str(const mpz_t *i, unsigned int base) {
char *s = m_new(char, mp_int_format_size(mpz_max_num_bits(i), base, NULL, '\0'));
mpz_as_str_inpl(i, base, NULL, 'a', '\0', s);
return s;
@@ -1685,7 +1685,7 @@ char *mpz_as_str(const mpz_t *i, mp_uint_t base) {
// assumes enough space as calculated by mp_int_format_size
// returns length of string, not including null byte
-size_t mpz_as_str_inpl(const mpz_t *i, mp_uint_t base, const char *prefix, char base_char, char comma, char *str) {
+size_t mpz_as_str_inpl(const mpz_t *i, unsigned int base, const char *prefix, char base_char, char comma, char *str) {
if (str == NULL) {
return 0;
}
diff --git a/py/mpz.h b/py/mpz.h
index 1e91ca330..5c8822722 100644
--- a/py/mpz.h
+++ b/py/mpz.h
@@ -108,7 +108,7 @@ void mpz_set_from_ll(mpz_t *z, long long i, bool is_signed);
#if MICROPY_PY_BUILTINS_FLOAT
void mpz_set_from_float(mpz_t *z, mp_float_t src);
#endif
-size_t mpz_set_from_str(mpz_t *z, const char *str, size_t len, bool neg, mp_uint_t base);
+size_t mpz_set_from_str(mpz_t *z, const char *str, size_t len, bool neg, unsigned int base);
void mpz_set_from_bytes(mpz_t *z, bool big_endian, size_t len, const byte *buf);
bool mpz_is_zero(const mpz_t *z);
@@ -137,6 +137,6 @@ void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf);
#if MICROPY_PY_BUILTINS_FLOAT
mp_float_t mpz_as_float(const mpz_t *z);
#endif
-size_t mpz_as_str_inpl(const mpz_t *z, mp_uint_t base, const char *prefix, char base_char, char comma, char *str);
+size_t mpz_as_str_inpl(const mpz_t *z, unsigned int base, const char *prefix, char base_char, char comma, char *str);
#endif // __MICROPY_INCLUDED_PY_MPZ_H__
--
GitLab