Skip to content

Commit 09fef11

Browse files
committed
style: Make naming of global trap functions make sense
1 parent 6755852 commit 09fef11

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/src/public/bash-core.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ core.trap_add() {
4444
printf '%s\n' "Error: core.trap_add: Passing numbers for the signal specs is prohibited"
4545
return 1
4646
fi; unset regex
47-
signal_spec="${signal_spec#SIG}"
47+
signal_spec=${signal_spec#SIG}
4848
if ! declare -f "$function" &>/dev/null; then
4949
printf '%s\n' "Error: core.trap_add: Function '$function' not defined" >&2
5050
return 1
@@ -54,10 +54,10 @@ core.trap_add() {
5454
___global_trap_table___["$signal_spec"]="${___global_trap_table___[$signal_spec]}"$'\x1C'"$function"
5555

5656
local global_trap_handler_name=
57-
printf -v global_trap_handler_name '%q' "___global_trap_${signal_spec}_handler___"
57+
printf -v global_trap_handler_name '%q' "core.trap_handler_${signal_spec}"
5858

5959
if ! eval "$global_trap_handler_name() {
60-
core.trap_common_global_handler "$signal_spec"
60+
core.trap_handler_common "$signal_spec"
6161
}"; then
6262
printf '%s\n' "Error: core.trap_add: Could not eval function"
6363
return 1

pkg/src/util/util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# shellcheck shell=bash
22

3-
core.trap_common_global_handler() {
3+
core.trap_handler_common() {
44
local signal_spec="$1"
55

66
local trap_handlers=

0 commit comments

Comments
 (0)