Skip to content

Commit e7b4296

Browse files
committed
Use validation functions
1 parent 4437153 commit e7b4296

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

shared-bindings/audiobusio/PDMIn.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_pdmin___exit___obj, 4, 4,
188188
STATIC mp_obj_t audiobusio_pdmin_obj_record(mp_obj_t self_obj, mp_obj_t destination, mp_obj_t destination_length) {
189189
audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_obj);
190190
check_for_deinit(self);
191-
if (!mp_obj_is_small_int(destination_length) || MP_OBJ_SMALL_INT_VALUE(destination_length) < 0) {
192-
mp_raise_TypeError(translate("destination_length must be an int >= 0"));
193-
}
194-
uint32_t length = MP_OBJ_SMALL_INT_VALUE(destination_length);
191+
uint32_t length = mp_arg_validate_type_int(destination_length, MP_QSTR_length);
192+
mp_arg_validate_length_min(length, 0, MP_QSTR_length);
195193

196194
mp_buffer_info_t bufinfo;
197195
if (mp_obj_is_type(destination, &mp_type_fileio)) {

shared-bindings/vectorio/Circle.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ static mp_obj_t vectorio_circle_make_new(const mp_obj_type_t *type, size_t n_arg
3434
mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
3535

3636
mp_int_t radius = args[ARG_radius].u_int;
37-
if (radius < 1) {
38-
mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_radius);
39-
}
37+
mp_arg_validate_int_min(radius, 1, MP_QSTR_radius);
4038

4139
vectorio_circle_t *self = m_new_obj(vectorio_circle_t);
4240
self->base.type = &vectorio_circle_type;

shared-bindings/vectorio/Rectangle.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ static mp_obj_t vectorio_rectangle_make_new(const mp_obj_type_t *type, size_t n_
3434
mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
3535

3636
mp_int_t width = args[ARG_width].u_int;
37-
if (width < 1) {
38-
mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_width);
39-
}
37+
mp_arg_validate_int_min(width, 1, MP_QSTR_width);
4038
mp_int_t height = args[ARG_height].u_int;
41-
if (height < 1) {
42-
mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_height);
43-
}
39+
mp_arg_validate_int_min(height, 1, MP_QSTR_height);
4440

4541
vectorio_rectangle_t *self = m_new_obj(vectorio_rectangle_t);
4642
self->base.type = &vectorio_rectangle_type;

0 commit comments

Comments
 (0)