Skip to content

Commit 3a92c07

Browse files
jeplerjepler
committed
Finish renaming os_environ_get_key to os_getenv
.. for consistency.
1 parent 529ec23 commit 3a92c07

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎ports/espressif/common-hal/_bleio/Adapter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void common_hal_bleio_adapter_set_enabled(bleio_adapter_obj_t *self, bool enable
103103

104104
#if CIRCUITPY_OS_GETENV
105105
char ble_name[1 + MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH];
106-
os_environ_err_t result = common_hal_os_environ_get_key_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
106+
os_environ_err_t result = common_hal_os_getenv_str("CIRCUITPY_BLE_NAME", ble_name, sizeof(ble_name));
107107
if (result == ENVIRON_OK) {
108108
ble_svc_gap_device_name_set(ble_name);
109109
} else

‎ports/espressif/supervisor/port.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ void port_idle_until_interrupt(void) {
519519
void port_post_boot_py(bool heap_valid) {
520520
if (!heap_valid && filesystem_present()) {
521521
mp_int_t reserved;
522-
if (common_hal_os_environ_get_key_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
522+
if (common_hal_os_getenv_int("CIRCUITPY_RESERVED_PSRAM", &reserved) == ENVIRON_OK) {
523523
common_hal_espidf_set_reserved_psram(reserved);
524524
}
525525
common_hal_espidf_reserve_psram();

‎shared-module/os/__init__.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef enum {
3838
// Allocation free version that returns the full length of the value.
3939
// If it fits, the return value is 0-terminated. If the value doesn't fit,
4040
// *value_len may be an over-estimate but never an under-estimate.
41-
os_environ_err_t common_hal_os_environ_get_key_str(const char *key, char *value, size_t value_len);
41+
os_environ_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
4242

4343
// Returns ENVIRON_ERR_OK and sets value to the read value. Returns
4444
// ENVIRON_ERR_... if the value was not numeric. allocation-free.

‎shared-module/os/getenv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ STATIC os_environ_err_t os_environ_get_key_buf_terminated(const char *key, char
323323
return result;
324324
}
325325

326-
os_environ_err_t common_hal_os_environ_get_key_str(const char *key, char *value, size_t value_len) {
326+
os_environ_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len) {
327327
bool quoted;
328328
os_environ_err_t result = os_environ_get_key_buf_terminated(key, value, value_len, &quoted);
329329
if (result == ENVIRON_OK && !quoted) {

‎supervisor/shared/web_workflow/web_workflow.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ void supervisor_start_web_workflow(void) {
251251
size_t ssid_len = 0;
252252
size_t password_len = 0;
253253

254-
os_environ_err_t result = common_hal_os_environ_get_key_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
254+
os_environ_err_t result = common_hal_os_getenv_str("CIRCUITPY_WIFI_SSID", ssid, sizeof(ssid));
255255
if (result != ENVIRON_OK) {
256256
return;
257257
}

0 commit comments

Comments
 (0)