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

Rename mp_type_getbuffer -> mp_type_get_getbuffer_slot

Browse Source
This commit is contained in:
Jeff Epler 2021-07-12 07:04:02 -05:00
parent cdd879a3cc
commit 1b2da0cda3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/unix/modffi.c
View File

@ -456,7 +456,7 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
const char *s = mp_obj_str_get_str(a); const char *s = mp_obj_str_get_str(a);
values[i].ffi = (ffi_arg)(intptr_t)s; values[i].ffi = (ffi_arg)(intptr_t)s;
} else { } else {
mp_getbuffer_fun_t get_buffer = mp_type_getbuffer(((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type); mp_getbuffer_fun_t get_buffer = mp_type_get_getbuffer_slot(((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type);
if (get_buffer != NULL) { if (get_buffer != NULL) {
mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a); mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a);
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;

4
py/obj.c
View File

@ -652,7 +652,7 @@ mp_obj_t mp_obj_new_generic_iterator(mp_obj_t obj, mp_obj_iter_buf_t *iter_buf)
bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) { bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
const mp_obj_type_t *type = mp_obj_get_type(obj); const mp_obj_type_t *type = mp_obj_get_type(obj);
const mp_getbuffer_fun_t get_buffer = mp_type_getbuffer(type); const mp_getbuffer_fun_t get_buffer = mp_type_get_getbuffer_slot(type);
if (get_buffer == NULL) { if (get_buffer == NULL) {
return false; return false;
} }
@ -730,7 +730,7 @@ mp_fun_1_t mp_type_get_iternext_slot(const mp_obj_type_t *type) {
} }
mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *type) { mp_getbuffer_fun_t mp_type_get_getbuffer_slot(const mp_obj_type_t *type) {
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) { if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
return NULL; return NULL;
} }

2
py/obj.h
View File

@ -668,7 +668,7 @@ extern mp_binary_op_fun_t mp_type_get_binary_op_slot(const mp_obj_type_t *);
extern mp_subscr_fun_t mp_type_get_subscr_slot(const mp_obj_type_t *); extern mp_subscr_fun_t mp_type_get_subscr_slot(const mp_obj_type_t *);
extern mp_getiter_fun_t mp_type_get_getiter_slot(const mp_obj_type_t *); extern mp_getiter_fun_t mp_type_get_getiter_slot(const mp_obj_type_t *);
extern mp_fun_1_t mp_type_get_iternext_slot(const mp_obj_type_t *); extern mp_fun_1_t mp_type_get_iternext_slot(const mp_obj_type_t *);
extern mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *); extern mp_getbuffer_fun_t mp_type_get_getbuffer_slot(const mp_obj_type_t *);
extern const void *mp_type_protocol(const mp_obj_type_t *); extern const void *mp_type_protocol(const mp_obj_type_t *);
// These fields ended up not being placed in the extended area, but accessors // These fields ended up not being placed in the extended area, but accessors