Skip to content

Commit 7f5d5c7

Browse files
jimmojimmo
committed
all: Rename mod_umodule*, ^umodule* to remove the "u" prefix.
This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <[email protected]>
1 parent 1bf2dcb commit 7f5d5c7

37 files changed

+357
-358
lines changed

‎examples/natmod/uheapq/uheapq.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
88
MP_DYNRUNTIME_INIT_ENTRY
99

1010
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_heapq));
11-
mp_store_global(MP_QSTR_heappush, MP_OBJ_FROM_PTR(&mod_uheapq_heappush_obj));
12-
mp_store_global(MP_QSTR_heappop, MP_OBJ_FROM_PTR(&mod_uheapq_heappop_obj));
13-
mp_store_global(MP_QSTR_heapify, MP_OBJ_FROM_PTR(&mod_uheapq_heapify_obj));
11+
mp_store_global(MP_QSTR_heappush, MP_OBJ_FROM_PTR(&mod_heapq_heappush_obj));
12+
mp_store_global(MP_QSTR_heappop, MP_OBJ_FROM_PTR(&mod_heapq_heappop_obj));
13+
mp_store_global(MP_QSTR_heapify, MP_OBJ_FROM_PTR(&mod_heapq_heapify_obj));
1414

1515
MP_DYNRUNTIME_INIT_EXIT
1616
}

‎examples/natmod/urandom/urandom.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
1717
yasmarang_d = 233;
1818

1919
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_random));
20-
mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_urandom_getrandbits_obj));
21-
mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_urandom_seed_obj));
20+
mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_random_getrandbits_obj));
21+
mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_random_seed_obj));
2222
#if MICROPY_PY_URANDOM_EXTRA_FUNCS
23-
mp_store_global(MP_QSTR_randrange, MP_OBJ_FROM_PTR(&mod_urandom_randrange_obj));
24-
mp_store_global(MP_QSTR_randint, MP_OBJ_FROM_PTR(&mod_urandom_randint_obj));
25-
mp_store_global(MP_QSTR_choice, MP_OBJ_FROM_PTR(&mod_urandom_choice_obj));
23+
mp_store_global(MP_QSTR_randrange, MP_OBJ_FROM_PTR(&mod_random_randrange_obj));
24+
mp_store_global(MP_QSTR_randint, MP_OBJ_FROM_PTR(&mod_random_randint_obj));
25+
mp_store_global(MP_QSTR_choice, MP_OBJ_FROM_PTR(&mod_random_choice_obj));
2626
#if MICROPY_PY_BUILTINS_FLOAT
27-
mp_store_global(MP_QSTR_random, MP_OBJ_FROM_PTR(&mod_urandom_random_obj));
28-
mp_store_global(MP_QSTR_uniform, MP_OBJ_FROM_PTR(&mod_urandom_uniform_obj));
27+
mp_store_global(MP_QSTR_random, MP_OBJ_FROM_PTR(&mod_random_random_obj));
28+
mp_store_global(MP_QSTR_uniform, MP_OBJ_FROM_PTR(&mod_random_uniform_obj));
2929
#endif
3030
#endif
3131

‎examples/natmod/uzlib/uzlib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
2828
MP_OBJ_TYPE_SET_SLOT(&decompio_type, locals_dict, (void*)&decompio_locals_dict, 2);
2929

3030
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_zlib));
31-
mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_uzlib_decompress_obj));
31+
mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_zlib_decompress_obj));
3232
mp_store_global(MP_QSTR_DecompIO, MP_OBJ_FROM_PTR(&decompio_type));
3333

3434
MP_DYNRUNTIME_INIT_EXIT

‎extmod/modlwip.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@ const mp_obj_module_t mp_module_lwip = {
18011801

18021802
MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
18031803

1804-
// On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c).
1804+
// On LWIP-ports, this is the socket module (replaces extmod/modusocket.c).
18051805
MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
18061806

18071807
MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);

‎extmod/moducryptolib.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *
211211

212212
#endif
213213

214-
STATIC mp_obj_t ucryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
214+
STATIC mp_obj_t cryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
215215
mp_arg_check_num(n_args, n_kw, 2, 3, false);
216216

217217
const mp_int_t block_mode = mp_obj_get_int(args[1]);
@@ -332,33 +332,33 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
332332
return mp_obj_new_bytes_from_vstr(&vstr);
333333
}
334334

335-
STATIC mp_obj_t ucryptolib_aes_encrypt(size_t n_args, const mp_obj_t *args) {
335+
STATIC mp_obj_t cryptolib_aes_encrypt(size_t n_args, const mp_obj_t *args) {
336336
return aes_process(n_args, args, true);
337337
}
338-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ucryptolib_aes_encrypt_obj, 2, 3, ucryptolib_aes_encrypt);
338+
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_encrypt_obj, 2, 3, cryptolib_aes_encrypt);
339339

340-
STATIC mp_obj_t ucryptolib_aes_decrypt(size_t n_args, const mp_obj_t *args) {
340+
STATIC mp_obj_t cryptolib_aes_decrypt(size_t n_args, const mp_obj_t *args) {
341341
return aes_process(n_args, args, false);
342342
}
343-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ucryptolib_aes_decrypt_obj, 2, 3, ucryptolib_aes_decrypt);
343+
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cryptolib_aes_decrypt_obj, 2, 3, cryptolib_aes_decrypt);
344344

345-
STATIC const mp_rom_map_elem_t ucryptolib_aes_locals_dict_table[] = {
346-
{ MP_ROM_QSTR(MP_QSTR_encrypt), MP_ROM_PTR(&ucryptolib_aes_encrypt_obj) },
347-
{ MP_ROM_QSTR(MP_QSTR_decrypt), MP_ROM_PTR(&ucryptolib_aes_decrypt_obj) },
345+
STATIC const mp_rom_map_elem_t cryptolib_aes_locals_dict_table[] = {
346+
{ MP_ROM_QSTR(MP_QSTR_encrypt), MP_ROM_PTR(&cryptolib_aes_encrypt_obj) },
347+
{ MP_ROM_QSTR(MP_QSTR_decrypt), MP_ROM_PTR(&cryptolib_aes_decrypt_obj) },
348348
};
349-
STATIC MP_DEFINE_CONST_DICT(ucryptolib_aes_locals_dict, ucryptolib_aes_locals_dict_table);
349+
STATIC MP_DEFINE_CONST_DICT(cryptolib_aes_locals_dict, cryptolib_aes_locals_dict_table);
350350

351351
STATIC MP_DEFINE_CONST_OBJ_TYPE(
352-
ucryptolib_aes_type,
352+
cryptolib_aes_type,
353353
MP_QSTR_aes,
354354
MP_TYPE_FLAG_NONE,
355-
make_new, ucryptolib_aes_make_new,
356-
locals_dict, &ucryptolib_aes_locals_dict
355+
make_new, cryptolib_aes_make_new,
356+
locals_dict, &cryptolib_aes_locals_dict
357357
);
358358

359359
STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
360360
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
361-
{ MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&ucryptolib_aes_type) },
361+
{ MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&cryptolib_aes_type) },
362362
#if MICROPY_PY_UCRYPTOLIB_CONSTS
363363
{ MP_ROM_QSTR(MP_QSTR_MODE_ECB), MP_ROM_INT(UCRYPTOLIB_MODE_ECB) },
364364
{ MP_ROM_QSTR(MP_QSTR_MODE_CBC), MP_ROM_INT(UCRYPTOLIB_MODE_CBC) },

0 commit comments

Comments
 (0)