mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py/modstruct: Remove unreachable code, and add comment about CPy diff. 

The deleted code is unreachable because calcsize_items guarantees that
num_items corresponds to how many items there are in fmt to unpack.
This commit is contained in:
Damien George 2016-10-07 12:54:14 +11:00
parent 9fdba0e09c
commit dffa383b06
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/modstruct.c
View File

@ -156,9 +156,6 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) {
} }
for (uint i = 0; i < num_items;) { for (uint i = 0; i < num_items;) {
if (*fmt == '\0') {
break;
}
mp_uint_t sz = 1; mp_uint_t sz = 1;
if (unichar_isdigit(*fmt)) { if (unichar_isdigit(*fmt)) {
sz = get_fmt_num(&fmt); sz = get_fmt_num(&fmt);
@ -191,6 +188,7 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, byte* end_p, siz
for (i = 0; i < n_args;) { for (i = 0; i < n_args;) {
mp_uint_t sz = 1; mp_uint_t sz = 1;
if (*fmt == '\0') { if (*fmt == '\0') {
// more arguments given than used by format string; CPython raises struct.error here
break; break;
} }
if (unichar_isdigit(*fmt)) { if (unichar_isdigit(*fmt)) {