diff --git a/sdk/wscript b/sdk/wscript index e287172a..f0f7b1cb 100644 --- a/sdk/wscript +++ b/sdk/wscript @@ -35,7 +35,7 @@ def _generate_sdk_waf(ctx): for tool in sdk_waftools + shared_waftools: path = ctx.path.parent.find_node(tool) if path is None: - ctx.fatal("Trying to bundle non existent resource in pb-waf ({})".format(tool)) + ctx.fatal("Trying to bundle nonexistent resource in pb-waf ({})".format(tool)) pebble_waf_tools.append(path) # We cannot run this as a sub-wscript because we use a specific vendor-provided diff --git a/src/fw/applib/ui/menu_layer.c b/src/fw/applib/ui/menu_layer.c index beb42c76..979def6e 100644 --- a/src/fw/applib/ui/menu_layer.c +++ b/src/fw/applib/ui/menu_layer.c @@ -393,7 +393,7 @@ static void prv_menu_layer_walk_downward_from_iterator(MenuIterator *it) { it->cursor.sep = prv_menu_layer_get_separator_height(it->menu_layer, &it->cursor.index); it->cursor.y = it->cell_bottom_y; // Bottom of previous cell is y of the next cell - // Don't leave space for the seperator for the (non-existent) row after the last row. + // Don't leave space for the seperator for the (nonexistent) row after the last row. // This doesn't impact cell drawing in this loop (this condition will only trip on the last run). // But, other parts of the system rely on the cursor being set properly at the end of this iteration. if (it->cursor.index.row < num_rows_in_section - 1 || it->cursor.index.section < num_sections - 1) { diff --git a/src/fw/comm/ble/gap_le_connect.c b/src/fw/comm/ble/gap_le_connect.c index 8e13893e..29ac604d 100644 --- a/src/fw/comm/ble/gap_le_connect.c +++ b/src/fw/comm/ble/gap_le_connect.c @@ -317,7 +317,7 @@ void bt_driver_handle_le_connection_handle_update_address_and_irk(const BleAddre GAPLEConnection *connection = gap_le_connection_by_device(&e->device); if (!connection) { PBL_LOG(LOG_LEVEL_ERROR, - "Got address & IRK update for non-existent connection. " + "Got address & IRK update for nonexistent connection. " "Old addr:"BT_DEVICE_ADDRESS_FMT, BT_DEVICE_ADDRESS_XPLODE(e->device.address)); goto unlock; } diff --git a/src/fw/comm/ble/kernel_le_client/ancs/ancs.c b/src/fw/comm/ble/kernel_le_client/ancs/ancs.c index 47b863fd..275e75d0 100644 --- a/src/fw/comm/ble/kernel_le_client/ancs/ancs.c +++ b/src/fw/comm/ble/kernel_le_client/ancs/ancs.c @@ -973,7 +973,7 @@ void ancs_handle_write_response(BLECharacteristic characteristic, BLEGATTError e prv_ancs_is_alive(); } - // We asked for a non-existent notification, go to the next one + // We asked for a nonexistent notification, go to the next one prv_reset_and_next(); return; } diff --git a/src/fw/services/normal/data_logging/dls_endpoint.c b/src/fw/services/normal/data_logging/dls_endpoint.c index 1083ad8b..c21a35bf 100644 --- a/src/fw/services/normal/data_logging/dls_endpoint.c +++ b/src/fw/services/normal/data_logging/dls_endpoint.c @@ -325,7 +325,7 @@ bool dls_endpoint_send_data(DataLoggingSession *logging_session, const uint8_t * static void prv_dls_endpoint_handle_ack(uint8_t session_id) { DataLoggingSession *session = dls_list_find_by_session_id(session_id); if (session == NULL) { - PBL_LOG_D(LOG_DOMAIN_DATA_LOGGING, LOG_LEVEL_WARNING, "Received ack for non-existent session id: %"PRIu8, session_id); + PBL_LOG_D(LOG_DOMAIN_DATA_LOGGING, LOG_LEVEL_WARNING, "Received ack for nonexistent session id: %"PRIu8, session_id); return; } @@ -363,7 +363,7 @@ static void prv_dls_endpoint_handle_nack(uint8_t session_id) { DataLoggingSession *logging_session = dls_list_find_by_session_id(session_id); if (!logging_session) { - PBL_LOG_D(LOG_DOMAIN_DATA_LOGGING, LOG_LEVEL_WARNING, "Received nack for non-existent session id: %"PRIu8, session_id); + PBL_LOG_D(LOG_DOMAIN_DATA_LOGGING, LOG_LEVEL_WARNING, "Received nack for nonexistent session id: %"PRIu8, session_id); return; } diff --git a/tests/fw/comm/test_gap_le_advert.c b/tests/fw/comm/test_gap_le_advert.c index 877ae22e..22dda29c 100644 --- a/tests/fw/comm/test_gap_le_advert.c +++ b/tests/fw/comm/test_gap_le_advert.c @@ -827,7 +827,7 @@ void test_gap_le_advert__invalid_params(void) { } void test_gap_le_advert__unschedule_non_existent(void) { - // Unscheduling non-existent job should be fine, should not crash: + // Unscheduling nonexistent job should be fine, should not crash: gap_le_advert_unschedule((GAPLEAdvertisingJobRef)(uintptr_t) 0x1234); // Unschedule callback should not have been called: diff --git a/tests/fw/services/blob_db/test_reminder_db.c b/tests/fw/services/blob_db/test_reminder_db.c index 3ae3b155..41febbb0 100644 --- a/tests/fw/services/blob_db/test_reminder_db.c +++ b/tests/fw/services/blob_db/test_reminder_db.c @@ -283,7 +283,7 @@ void test_reminder_db__bad_item(void) { cl_assert(S_SUCCESS != reminder_db_insert((uint8_t *)&bad_item.common.id, UUID_SIZE, (uint8_t *)&bad_item, sizeof(bad_item))); } -void test_reminder_db__read_nonexistant(void) { +void test_reminder_db__read_nonexistent(void) { TimelineItem item = {{{0}}}; cl_assert_equal_i(E_DOES_NOT_EXIST, reminder_db_read_item(&item, &bad_item.common.id)); } diff --git a/tests/fw/services/test_voice_endpoint.c b/tests/fw/services/test_voice_endpoint.c index ce0063c7..e00f53d2 100644 --- a/tests/fw/services/test_voice_endpoint.c +++ b/tests/fw/services/test_voice_endpoint.c @@ -506,7 +506,7 @@ void test_voice_endpoint__handle_nlp_result(void) { cl_assert_equal_i(s_session_result, VoiceEndpointResultSuccess); cl_assert_equal_i(s_session_id, 0x2211); - // test non nexistent timestamp msg + // test nonexistent timestamp msg nlp_result[8] = 1; s_session_id = 0; voice_endpoint_protocol_msg_callback(NULL, nlp_result, sizeof(nlp_result) - 7);