djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Use mp_obj_str_get_str instead of mp_obj_str_get_data.

Browse Source
This commit is contained in:
Damien George 2017-03-25 19:54:07 +11:00
parent ab5689bc9d
commit 29424304d9
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unix/modffi.c
View File

@ -126,8 +126,7 @@ STATIC ffi_type *char2ffi_type(char c)
STATIC ffi_type *get_ffi_type(mp_obj_t o_in)
{
if (MP_OBJ_IS_STR(o_in)) {
mp_uint_t len;
const char *s = mp_obj_str_get_data(o_in, &len);
const char *s = mp_obj_str_get_str(o_in);
ffi_type *t = char2ffi_type(*s);
if (t != NULL) {
return t;

9
unix/modos.c
View File

@ -46,8 +46,7 @@
STATIC mp_obj_t mod_os_stat(mp_obj_t path_in) {
struct stat sb;
mp_uint_t len;
const char *path = mp_obj_str_get_data(path_in, &len);
const char *path = mp_obj_str_get_str(path_in);
int res = stat(path, &sb);
RAISE_ERRNO(res, errno);
@ -87,8 +86,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_stat_obj, mod_os_stat);
STATIC mp_obj_t mod_os_statvfs(mp_obj_t path_in) {
STRUCT_STATVFS sb;
mp_uint_t len;
const char *path = mp_obj_str_get_data(path_in, &len);
const char *path = mp_obj_str_get_str(path_in);
int res = STATVFS(path, &sb);
RAISE_ERRNO(res, errno);
@ -110,8 +108,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_statvfs_obj, mod_os_statvfs);
#endif
STATIC mp_obj_t mod_os_unlink(mp_obj_t path_in) {
mp_uint_t len;
const char *path = mp_obj_str_get_data(path_in, &len);
const char *path = mp_obj_str_get_str(path_in);
int r = unlink(path);

3
unix/modtermios.c
View File

@ -90,8 +90,7 @@ STATIC mp_obj_t mod_termios_tcsetattr(mp_obj_t fd_in, mp_obj_t when_in, mp_obj_t
if (i == VMIN || i == VTIME) {
term.c_cc[i] = mp_obj_get_int(cc->items[i]);
} else {
mp_uint_t len;
term.c_cc[i] = *mp_obj_str_get_data(cc->items[i], &len);
term.c_cc[i] = *mp_obj_str_get_str(cc->items[i]);
}
}