summaryrefslogtreecommitdiff
path: root/extmod
diff options
context:
space:
mode:
Diffstat (limited to 'extmod')
-rw-r--r--extmod/modlwip.c2
-rw-r--r--extmod/modnetwork.c2
-rw-r--r--extmod/modopenamp.c2
-rw-r--r--extmod/modopenamp_remoteproc_store.c2
-rw-r--r--extmod/modtls_mbedtls.c6
-rw-r--r--extmod/modwebrepl.c2
-rw-r--r--extmod/network_esp_hosted.c2
-rw-r--r--extmod/network_lwip.c4
-rw-r--r--extmod/network_ninaw10.c2
-rw-r--r--extmod/vfs.c2
-rw-r--r--extmod/vfs_fat.c4
-rw-r--r--extmod/vfs_lfsx.c2
-rw-r--r--extmod/vfs_posix.c4
13 files changed, 18 insertions, 18 deletions
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index bcee3f0ff..b07c1d815 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -373,7 +373,7 @@ mp_obj_t lwip_format_inet_addr(const ip_addr_t *ip, mp_uint_t port) {
char ipstr[IPADDR_STRLEN_MAX];
ipaddr_ntoa_r(ip, ipstr, sizeof(ipstr));
mp_obj_t tuple[2] = {
- tuple[0] = mp_obj_new_str(ipstr, strlen(ipstr)),
+ tuple[0] = mp_obj_new_str_from_cstr(ipstr),
tuple[1] = mp_obj_new_int(port),
};
return mp_obj_new_tuple(2, tuple);
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 88f9d3718..f3d7d0faa 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -127,7 +127,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_network_country_obj, 0, 1, network_count
mp_obj_t mod_network_hostname(size_t n_args, const mp_obj_t *args) {
if (n_args == 0) {
- return mp_obj_new_str(mod_network_hostname_data, strlen(mod_network_hostname_data));
+ return mp_obj_new_str_from_cstr(mod_network_hostname_data);
} else {
size_t len;
const char *str = mp_obj_str_get_data(args[0], &len);
diff --git a/extmod/modopenamp.c b/extmod/modopenamp.c
index 7a19e55a6..29135d57a 100644
--- a/extmod/modopenamp.c
+++ b/extmod/modopenamp.c
@@ -263,7 +263,7 @@ static void openamp_ns_callback(struct rpmsg_device *rdev, const char *name, uin
// the Name Service (NS) announcement containing the name of the channel.
virtio_dev_obj_t *virtio_device = metal_container_of(rdev, virtio_dev_obj_t, rvdev);
if (virtio_device->ns_callback != mp_const_none) {
- mp_call_function_2(virtio_device->ns_callback, mp_obj_new_int(dest), mp_obj_new_str(name, strlen(name)));
+ mp_call_function_2(virtio_device->ns_callback, mp_obj_new_int(dest), mp_obj_new_str_from_cstr(name));
}
}
diff --git a/extmod/modopenamp_remoteproc_store.c b/extmod/modopenamp_remoteproc_store.c
index 262e6f2ec..aed652c48 100644
--- a/extmod/modopenamp_remoteproc_store.c
+++ b/extmod/modopenamp_remoteproc_store.c
@@ -70,7 +70,7 @@ void *mp_openamp_remoteproc_store_alloc(void) {
static int openamp_remoteproc_store_open(void *store, const char *path, const void **image_data) {
metal_log(METAL_LOG_DEBUG, "store_open(): %s\n", path);
mp_obj_t args[2] = {
- mp_obj_new_str(path, strlen(path)),
+ mp_obj_new_str_from_cstr(path),
MP_OBJ_NEW_QSTR(MP_QSTR_rb),
};
diff --git a/extmod/modtls_mbedtls.c b/extmod/modtls_mbedtls.c
index 6db6ac195..5a9487ab8 100644
--- a/extmod/modtls_mbedtls.c
+++ b/extmod/modtls_mbedtls.c
@@ -307,7 +307,7 @@ static mp_obj_t ssl_context_get_ciphers(mp_obj_t self_in) {
mp_obj_t list = mp_obj_new_list(0, NULL);
for (const int *cipher_list = mbedtls_ssl_list_ciphersuites(); *cipher_list; ++cipher_list) {
const char *cipher_name = mbedtls_ssl_get_ciphersuite_name(*cipher_list);
- mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str(cipher_name, strlen(cipher_name))));
+ mp_obj_list_append(list, MP_OBJ_FROM_PTR(mp_obj_new_str_from_cstr(cipher_name)));
}
return list;
}
@@ -572,8 +572,8 @@ static mp_obj_t mod_ssl_cipher(mp_obj_t o_in) {
mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
const char *cipher_suite = mbedtls_ssl_get_ciphersuite(&o->ssl);
const char *tls_version = mbedtls_ssl_get_version(&o->ssl);
- mp_obj_t tuple[2] = {mp_obj_new_str(cipher_suite, strlen(cipher_suite)),
- mp_obj_new_str(tls_version, strlen(tls_version))};
+ mp_obj_t tuple[2] = {mp_obj_new_str_from_cstr(cipher_suite),
+ mp_obj_new_str_from_cstr(tls_version)};
return mp_obj_new_tuple(2, tuple);
}
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index 9d09f65a3..bac223d95 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -146,7 +146,7 @@ static void handle_op(mp_obj_webrepl_t *self) {
// Handle operations requiring opened file
mp_obj_t open_args[2] = {
- mp_obj_new_str(self->hdr.fname, strlen(self->hdr.fname)),
+ mp_obj_new_str_from_cstr(self->hdr.fname),
MP_OBJ_NEW_QSTR(MP_QSTR_rb)
};
diff --git a/extmod/network_esp_hosted.c b/extmod/network_esp_hosted.c
index 0747343d8..04cfc36b3 100644
--- a/extmod/network_esp_hosted.c
+++ b/extmod/network_esp_hosted.c
@@ -230,7 +230,7 @@ static mp_obj_t network_esp_hosted_config(size_t n_args, const mp_obj_t *args, m
case MP_QSTR_essid: {
esp_hosted_netinfo_t netinfo;
esp_hosted_wifi_netinfo(&netinfo);
- return mp_obj_new_str(netinfo.ssid, strlen(netinfo.ssid));
+ return mp_obj_new_str_from_cstr(netinfo.ssid);
}
case MP_QSTR_security: {
esp_hosted_netinfo_t netinfo;
diff --git a/extmod/network_lwip.c b/extmod/network_lwip.c
index 329a45c46..71dc295e1 100644
--- a/extmod/network_lwip.c
+++ b/extmod/network_lwip.c
@@ -113,7 +113,7 @@ mp_obj_t mod_network_ipconfig(size_t n_args, const mp_obj_t *args, mp_map_t *kwa
case MP_QSTR_dns: {
char addr_str[IPADDR_STRLEN_MAX];
ipaddr_ntoa_r(dns_getserver(0), addr_str, sizeof(addr_str));
- return mp_obj_new_str(addr_str, strlen(addr_str));
+ return mp_obj_new_str_from_cstr(addr_str);
}
case MP_QSTR_prefer: {
return MP_OBJ_NEW_SMALL_INT(mp_mod_network_prefer_dns_use_ip_version);
@@ -219,7 +219,7 @@ mp_obj_t mod_network_nic_ipconfig(struct netif *netif, size_t n_args, const mp_o
char addr_str[IPADDR_STRLEN_MAX];
ipaddr_ntoa_r(netif_ip_addr6(netif, i), addr_str, sizeof(addr_str));
mp_obj_t tuple[4] = {
- mp_obj_new_str(addr_str, strlen(addr_str)),
+ mp_obj_new_str_from_cstr(addr_str),
MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_state(netif, i)),
MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_pref_life(netif, i)), // preferred
MP_OBJ_NEW_SMALL_INT(netif_ip6_addr_valid_life(netif, i))
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 702adcd97..62961f871 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -536,7 +536,7 @@ static mp_obj_t network_ninaw10_config(size_t n_args, const mp_obj_t *args, mp_m
case MP_QSTR_ssid: {
nina_netinfo_t netinfo;
nina_netinfo(&netinfo);
- return mp_obj_new_str(netinfo.ssid, strlen(netinfo.ssid));
+ return mp_obj_new_str_from_cstr(netinfo.ssid);
}
case MP_QSTR_security: {
nina_netinfo_t netinfo;
diff --git a/extmod/vfs.c b/extmod/vfs.c
index ae09b8afe..5d564459c 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -139,7 +139,7 @@ mp_import_stat_t mp_vfs_import_stat(const char *path) {
}
// delegate to vfs.stat() method
- mp_obj_t path_o = mp_obj_new_str(path_out, strlen(path_out));
+ mp_obj_t path_o = mp_obj_new_str_from_cstr(path_out);
mp_obj_t stat;
nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) {
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 38c166336..4f01432f5 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -144,7 +144,7 @@ static mp_obj_t mp_vfs_fat_ilistdir_it_iternext(mp_obj_t self_in) {
// make 4-tuple with info about this entry
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(4, NULL));
if (self->is_str) {
- t->items[0] = mp_obj_new_str(fn, strlen(fn));
+ t->items[0] = mp_obj_new_str_from_cstr(fn);
} else {
t->items[0] = mp_obj_new_bytes((const byte *)fn, strlen(fn));
}
@@ -291,7 +291,7 @@ static mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
if (res != FR_OK) {
mp_raise_OSError(fresult_to_errno_table[res]);
}
- return mp_obj_new_str(buf, strlen(buf));
+ return mp_obj_new_str_from_cstr(buf);
}
static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getcwd_obj, fat_vfs_getcwd);
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 19da4417e..4b10ca3aa 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -192,7 +192,7 @@ static mp_obj_t MP_VFS_LFSx(ilistdir_it_iternext)(mp_obj_t self_in) {
// make 4-tuple with info about this entry
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(4, NULL));
if (self->is_str) {
- t->items[0] = mp_obj_new_str(info.name, strlen(info.name));
+ t->items[0] = mp_obj_new_str_from_cstr(info.name);
} else {
t->items[0] = mp_obj_new_bytes((const byte *)info.name, strlen(info.name));
}
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index ed4c06e36..bd9a6d840 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -194,7 +194,7 @@ static mp_obj_t vfs_posix_getcwd(mp_obj_t self_in) {
}
#endif
}
- return mp_obj_new_str(ret, strlen(ret));
+ return mp_obj_new_str_from_cstr(ret);
}
static MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_getcwd_obj, vfs_posix_getcwd);
@@ -234,7 +234,7 @@ static mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL));
if (self->is_str) {
- t->items[0] = mp_obj_new_str(fn, strlen(fn));
+ t->items[0] = mp_obj_new_str_from_cstr(fn);
} else {
t->items[0] = mp_obj_new_bytes((const byte *)fn, strlen(fn));
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-12 09:36:49 +0000