Skip to content

Commit 1b2da0c

Browse files
committed
Rename mp_type_getbuffer -> mp_type_get_getbuffer_slot
1 parent cdd879a commit 1b2da0c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ports/unix/modffi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
456456
const char *s = mp_obj_str_get_str(a);
457457
values[i].ffi = (ffi_arg)(intptr_t)s;
458458
} else {
459-
mp_getbuffer_fun_t get_buffer = mp_type_getbuffer(((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type);
459+
mp_getbuffer_fun_t get_buffer = mp_type_get_getbuffer_slot(((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type);
460460
if (get_buffer != NULL) {
461461
mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a);
462462
mp_buffer_info_t bufinfo;

py/obj.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ mp_obj_t mp_obj_new_generic_iterator(mp_obj_t obj, mp_obj_iter_buf_t *iter_buf)
652652

653653
bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
654654
const mp_obj_type_t *type = mp_obj_get_type(obj);
655-
const mp_getbuffer_fun_t get_buffer = mp_type_getbuffer(type);
655+
const mp_getbuffer_fun_t get_buffer = mp_type_get_getbuffer_slot(type);
656656
if (get_buffer == NULL) {
657657
return false;
658658
}
@@ -730,7 +730,7 @@ mp_fun_1_t mp_type_get_iternext_slot(const mp_obj_type_t *type) {
730730
}
731731

732732

733-
mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *type) {
733+
mp_getbuffer_fun_t mp_type_get_getbuffer_slot(const mp_obj_type_t *type) {
734734
if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
735735
return NULL;
736736
}

py/obj.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ extern mp_binary_op_fun_t mp_type_get_binary_op_slot(const mp_obj_type_t *);
668668
extern mp_subscr_fun_t mp_type_get_subscr_slot(const mp_obj_type_t *);
669669
extern mp_getiter_fun_t mp_type_get_getiter_slot(const mp_obj_type_t *);
670670
extern mp_fun_1_t mp_type_get_iternext_slot(const mp_obj_type_t *);
671-
extern mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *);
671+
extern mp_getbuffer_fun_t mp_type_get_getbuffer_slot(const mp_obj_type_t *);
672672
extern const void *mp_type_protocol(const mp_obj_type_t *);
673673

674674
// These fields ended up not being placed in the extended area, but accessors

0 commit comments

Comments
 (0)