gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-18 05:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use null, check for null

Browse Source
This commit is contained in:
Stephen Ostermiller 2025-06-27 18:10:27 -04:00
parent 2809c68d03
commit a10feeba4d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
quantum/process_keycode/process_tap_dance.c
View File

@ -39,26 +39,21 @@ tap_dance_state_t *tap_dance_get_state(uint8_t tap_dance_idx) {
if (tap_dance_idx >= tap_dance_count()) { if (tap_dance_idx >= tap_dance_count()) {
return NULL; return NULL;
} }
// Search for a state already used for this case // Search for a state already used for this keycode
for (i = 0; i < TAP_DANCE_MAX_SIMULTANEOUS; i++) { for (i = 0; i < TAP_DANCE_MAX_SIMULTANEOUS; i++) {
if (tap_dance_states[i].keycode == keycode) { if (tap_dance_states[i].keycode == keycode) {
return &tap_dance_states[i]; return &tap_dance_states[i];
} }
} }
// Search for the first free state // Search for the first available state
for (i = 0; i < TAP_DANCE_MAX_SIMULTANEOUS; i++) { for (i = 0; i < TAP_DANCE_MAX_SIMULTANEOUS; i++) {
if (tap_dance_states[i].keycode == 0) { if (tap_dance_states[i].keycode == 0) {
tap_dance_states[i].keycode = keycode; tap_dance_states[i].keycode = keycode;
return &tap_dance_states[i]; return &tap_dance_states[i];
} }
} }
// No states are free, reuse the last state. // No states are available, tap dance won't happen
// The undefined behavior that causes is return NULL;
// better than returning null. All the tap dances
// don't get processed correctly, but the keyboard
// doesn't crash when more than the max tap dance
// keys are held at the same time.
return &tap_dance_states[TAP_DANCE_MAX_SIMULTANEOUS - 1];
} }
void tap_dance_pair_on_each_tap(tap_dance_state_t *state, void *user_data) { void tap_dance_pair_on_each_tap(tap_dance_state_t *state, void *user_data) {
@ -171,8 +166,11 @@ bool preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
if (!active_td || keycode == active_td) return false; if (!active_td || keycode == active_td) return false;
action = tap_dance_get(QK_TAP_DANCE_GET_INDEX(active_td)); action = tap_dance_get(QK_TAP_DANCE_GET_INDEX(active_td));
state = tap_dance_get_state(QK_TAP_DANCE_GET_INDEX(active_td)); state = tap_dance_get_state(QK_TAP_DANCE_GET_INDEX(active_td));
if (state == NULL) {
return false;
}
state->interrupted = true; state->interrupted = true;
state->interrupting_keycode = keycode; state->interrupting_keycode = keycode;
process_tap_dance_action_on_dance_finished(action, state); process_tap_dance_action_on_dance_finished(action, state);
@ -201,7 +199,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
} }
action = tap_dance_get(td_index); action = tap_dance_get(td_index);
state = tap_dance_get_state(td_index); state = tap_dance_get_state(td_index);
if (state == NULL) {
return false;
}
state->pressed = record->event.pressed; state->pressed = record->event.pressed;
if (record->event.pressed) { if (record->event.pressed) {
last_tap_time = timer_read(); last_tap_time = timer_read();
@ -231,7 +231,7 @@ void tap_dance_task(void) {
action = tap_dance_get(QK_TAP_DANCE_GET_INDEX(active_td)); action = tap_dance_get(QK_TAP_DANCE_GET_INDEX(active_td));
state = tap_dance_get_state(QK_TAP_DANCE_GET_INDEX(active_td)); state = tap_dance_get_state(QK_TAP_DANCE_GET_INDEX(active_td));
if (!state->interrupted) { if (state != NULL && !state->interrupted) {
process_tap_dance_action_on_dance_finished(action, state); process_tap_dance_action_on_dance_finished(action, state);
} }
} }