commit 50912e7f5dc579fd2917537046793dfa30decadf
author Damien George <damien.p.george@gmail.com> Tue Jan 20 11:55:10 2015 +0000
committer Damien George <damien.p.george@gmail.com> Tue Jan 20 11:55:10 2015 +0000
tree 541d6f7531d9d75e168fc914f226d15b4c7faf04
parent 640e0b221e972f9a2da2d870bf3fc5a93c18f0ec

py, unix, stmhal: Allow to compile with -Wshadow.

See issue #699.

py/argcheck.c

diff --git a/py/argcheck.c b/py/argcheck.c
index 243ea60..d895ede 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -84,7 +84,7 @@
             pos_found++;
             given_arg = pos[i];
         } else {
-            mp_map_elem_t *kw = mp_map_lookup(kws, MP_OBJ_NEW_QSTR(allowed[i].qstr), MP_MAP_LOOKUP);
+            mp_map_elem_t *kw = mp_map_lookup(kws, MP_OBJ_NEW_QSTR(allowed[i].qst), MP_MAP_LOOKUP);
             if (kw == NULL) {
                 if (allowed[i].flags & MP_ARG_REQUIRED) {
                     if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
@@ -92,7 +92,7 @@
                     } else {
                         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
                             "'%s' argument required",
-                            qstr_str(allowed[i].qstr)));
+                            qstr_str(allowed[i].qst)));
                     }
                 }
                 out_vals[i] = allowed[i].defval;