Skip to content

Commit 204ded8

Browse files
dpgeorgedpgeorge
committed
extmod: Update for changes to mp_obj_str_get_data.
1 parent 6b34107 commit 204ded8

File tree

6 files changed

+19
-41
lines changed

6 files changed

+19
-41
lines changed

‎extmod/modbtree.c‎

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,16 @@ STATIC mp_obj_t btree_put(size_t n_args, const mp_obj_t *args) {
9797
(void)n_args;
9898
mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
9999
DBT key, val;
100-
// Different ports may have different type sizes
101-
mp_uint_t v;
102-
key.data = (void*)mp_obj_str_get_data(args[1], &v);
103-
key.size = v;
104-
val.data = (void*)mp_obj_str_get_data(args[2], &v);
105-
val.size = v;
100+
key.data = (void*)mp_obj_str_get_data(args[1], &key.size);
101+
val.data = (void*)mp_obj_str_get_data(args[2], &val.size);
106102
return MP_OBJ_NEW_SMALL_INT(__bt_put(self->db, &key, &val, 0));
107103
}
108104
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_put_obj, 3, 4, btree_put);
109105

110106
STATIC mp_obj_t btree_get(size_t n_args, const mp_obj_t *args) {
111107
mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
112108
DBT key, val;
113-
// Different ports may have different type sizes
114-
mp_uint_t v;
115-
key.data = (void*)mp_obj_str_get_data(args[1], &v);
116-
key.size = v;
109+
key.data = (void*)mp_obj_str_get_data(args[1], &key.size);
117110
int res = __bt_get(self->db, &key, &val, 0);
118111
if (res == RET_SPECIAL) {
119112
if (n_args > 2) {
@@ -132,10 +125,7 @@ STATIC mp_obj_t btree_seq(size_t n_args, const mp_obj_t *args) {
132125
int flags = MP_OBJ_SMALL_INT_VALUE(args[1]);
133126
DBT key, val;
134127
if (n_args > 2) {
135-
// Different ports may have different type sizes
136-
mp_uint_t v;
137-
key.data = (void*)mp_obj_str_get_data(args[2], &v);
138-
key.size = v;
128+
key.data = (void*)mp_obj_str_get_data(args[2], &key.size);
139129
}
140130

141131
int res = __bt_seq(self->db, &key, &val, flags);
@@ -206,14 +196,11 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
206196
mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
207197
DBT key, val;
208198
int res;
209-
// Different ports may have different type sizes
210-
mp_uint_t v;
211199
bool desc = self->flags & FLAG_DESC;
212200
if (self->start_key != MP_OBJ_NULL) {
213201
int flags = R_FIRST;
214202
if (self->start_key != mp_const_none) {
215-
key.data = (void*)mp_obj_str_get_data(self->start_key, &v);
216-
key.size = v;
203+
key.data = (void*)mp_obj_str_get_data(self->start_key, &key.size);
217204
flags = R_CURSOR;
218205
} else if (desc) {
219206
flags = R_LAST;
@@ -231,8 +218,7 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
231218

232219
if (self->end_key != mp_const_none) {
233220
DBT end_key;
234-
end_key.data = (void*)mp_obj_str_get_data(self->end_key, &v);
235-
end_key.size = v;
221+
end_key.data = (void*)mp_obj_str_get_data(self->end_key, &end_key.size);
236222
BTREE *t = self->db->internal;
237223
int cmp = t->bt_cmp(&key, &end_key);
238224
if (desc) {
@@ -264,13 +250,10 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
264250

265251
STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
266252
mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
267-
// Different ports may have different type sizes
268-
mp_uint_t v;
269253
if (value == MP_OBJ_NULL) {
270254
// delete
271255
DBT key;
272-
key.data = (void*)mp_obj_str_get_data(index, &v);
273-
key.size = v;
256+
key.data = (void*)mp_obj_str_get_data(index, &key.size);
274257
int res = __bt_delete(self->db, &key, 0);
275258
if (res == RET_SPECIAL) {
276259
nlr_raise(mp_obj_new_exception(&mp_type_KeyError));
@@ -280,8 +263,7 @@ STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
280263
} else if (value == MP_OBJ_SENTINEL) {
281264
// load
282265
DBT key, val;
283-
key.data = (void*)mp_obj_str_get_data(index, &v);
284-
key.size = v;
266+
key.data = (void*)mp_obj_str_get_data(index, &key.size);
285267
int res = __bt_get(self->db, &key, &val, 0);
286268
if (res == RET_SPECIAL) {
287269
nlr_raise(mp_obj_new_exception(&mp_type_KeyError));
@@ -291,10 +273,8 @@ STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
291273
} else {
292274
// store
293275
DBT key, val;
294-
key.data = (void*)mp_obj_str_get_data(index, &v);
295-
key.size = v;
296-
val.data = (void*)mp_obj_str_get_data(value, &v);
297-
val.size = v;
276+
key.data = (void*)mp_obj_str_get_data(index, &key.size);
277+
val.data = (void*)mp_obj_str_get_data(value, &val.size);
298278
int res = __bt_put(self->db, &key, &val, 0);
299279
CHECK_ERROR(res);
300280
return mp_const_none;
@@ -305,10 +285,8 @@ STATIC mp_obj_t btree_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in)
305285
mp_obj_btree_t *self = MP_OBJ_TO_PTR(lhs_in);
306286
switch (op) {
307287
case MP_BINARY_OP_IN: {
308-
mp_uint_t v;
309288
DBT key, val;
310-
key.data = (void*)mp_obj_str_get_data(rhs_in, &v);
311-
key.size = v;
289+
key.data = (void*)mp_obj_str_get_data(rhs_in, &key.size);
312290
int res = __bt_get(self->db, &key, &val, 0);
313291
CHECK_ERROR(res);
314292
return mp_obj_new_bool(res != RET_SPECIAL);

‎extmod/modujson.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
274274
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_load_obj, mod_ujson_load);
275275

276276
STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
277-
mp_uint_t len;
277+
size_t len;
278278
const char *buf = mp_obj_str_get_data(obj, &len);
279279
vstr_t vstr = {len, len, (char*)buf, true};
280280
mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0};

‎extmod/modure.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
9696
(void)n_args;
9797
mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);
9898
Subject subj;
99-
mp_uint_t len;
99+
size_t len;
100100
subj.begin = mp_obj_str_get_data(args[1], &len);
101101
subj.end = subj.begin + len;
102102
int caps_num = (self->re.sub + 1) * 2;
@@ -128,7 +128,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);
128128
STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
129129
mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);
130130
Subject subj;
131-
mp_uint_t len;
131+
size_t len;
132132
subj.begin = mp_obj_str_get_data(args[1], &len);
133133
subj.end = subj.begin + len;
134134
int caps_num = (self->re.sub + 1) * 2;

‎extmod/modussl_mbedtls.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
156156
mbedtls_ssl_set_bio(&o->ssl, &o->sock, _mbedtls_ssl_send, _mbedtls_ssl_recv, NULL);
157157

158158
if (args->key.u_obj != MP_OBJ_NULL) {
159-
mp_uint_t key_len;
159+
size_t key_len;
160160
const byte *key = (const byte*)mp_obj_str_get_data(args->key.u_obj, &key_len);
161161
// len should include terminating null
162162
ret = mbedtls_pk_parse_key(&o->pkey, key, key_len + 1, NULL, 0);
163163
assert(ret == 0);
164164

165-
mp_uint_t cert_len;
165+
size_t cert_len;
166166
const byte *cert = (const byte*)mp_obj_str_get_data(args->cert.u_obj, &cert_len);
167167
// len should include terminating null
168168
ret = mbedtls_x509_crt_parse(&o->cert, cert, cert_len + 1);

‎extmod/modwebrepl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ STATIC mp_obj_t webrepl_close(mp_obj_t self_in) {
308308
STATIC MP_DEFINE_CONST_FUN_OBJ_1(webrepl_close_obj, webrepl_close);
309309

310310
STATIC mp_obj_t webrepl_set_password(mp_obj_t passwd_in) {
311-
mp_uint_t len;
311+
size_t len;
312312
const char *passwd = mp_obj_str_get_data(passwd_in, &len);
313313
if (len > sizeof(webrepl_passwd) - 1) {
314314
mp_raise_ValueError("");

‎extmod/vfs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ mp_obj_t mp_vfs_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args
134134
mp_arg_parse_all(n_args - 2, pos_args + 2, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
135135

136136
// get the mount point
137-
mp_uint_t mnt_len;
137+
size_t mnt_len;
138138
const char *mnt_str = mp_obj_str_get_data(pos_args[1], &mnt_len);
139139

140140
// see if we need to auto-detect and create the filesystem
@@ -180,7 +180,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_vfs_mount_obj, 2, mp_vfs_mount);
180180
mp_obj_t mp_vfs_umount(mp_obj_t mnt_in) {
181181
// remove vfs from the mount table
182182
mp_vfs_mount_t *vfs = NULL;
183-
mp_uint_t mnt_len;
183+
size_t mnt_len;
184184
const char *mnt_str = NULL;
185185
if (MP_OBJ_IS_STR(mnt_in)) {
186186
mnt_str = mp_obj_str_get_data(mnt_in, &mnt_len);

0 commit comments

Comments
 (0)