py/modbuiltins: Simplify casts from char to byte ptr in builtin ord.

dpgeorge · dpgeorge · commit e98ff4060417 · 2018-02-14T18:27:14.000+11:00
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
@@ -343,19 +343,19 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_oct_obj, mp_builtin_oct);
 
 STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
     size_t len;
-    const char *str = mp_obj_str_get_data(o_in, &len);
+    const byte *str = (const byte*)mp_obj_str_get_data(o_in, &len);
     #if MICROPY_PY_BUILTINS_STR_UNICODE
     if (MP_OBJ_IS_STR(o_in)) {
-        len = utf8_charlen((const byte*)str, len);
+        len = utf8_charlen(str, len);
         if (len == 1) {
-            return mp_obj_new_int(utf8_get_char((const byte*)str));
+            return mp_obj_new_int(utf8_get_char(str));
         }
     } else
     #endif
     {
         // a bytes object, or a str without unicode support (don't sign extend the char)
         if (len == 1) {
-            return MP_OBJ_NEW_SMALL_INT(((const byte*)str)[0]);
+            return MP_OBJ_NEW_SMALL_INT(str[0]);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -343,19 +343,19 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_oct_obj, mp_builtin_oct);`
`343`	`343`
`344`	`344`	`STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {`
`345`	`345`	`size_t len;`
`346`		`- const char *str = mp_obj_str_get_data(o_in, &len);`
	`346`	`+ const byte str = (const byte)mp_obj_str_get_data(o_in, &len);`
`347`	`347`	`#if MICROPY_PY_BUILTINS_STR_UNICODE`
`348`	`348`	`if (MP_OBJ_IS_STR(o_in)) {`
`349`		`- len = utf8_charlen((const byte*)str, len);`
	`349`	`+ len = utf8_charlen(str, len);`
`350`	`350`	`if (len == 1) {`
`351`		`- return mp_obj_new_int(utf8_get_char((const byte*)str));`
	`351`	`+ return mp_obj_new_int(utf8_get_char(str));`
`352`	`352`	`}`
`353`	`353`	`} else`
`354`	`354`	`#endif`
`355`	`355`	`{`
`356`	`356`	`// a bytes object, or a str without unicode support (don't sign extend the char)`
`357`	`357`	`if (len == 1) {`
`358`		`- return MP_OBJ_NEW_SMALL_INT(((const byte*)str)[0]);`
	`358`	`+ return MP_OBJ_NEW_SMALL_INT(str[0]);`
`359`	`359`	`}`
`360`	`360`	`}`
`361`	`361`