diff options
author | Justin Boffemmyer | 2018-02-21 11:17:06 +0900 |
---|---|---|
committer | Justin Boffemmyer | 2018-02-21 11:17:06 +0900 |
commit | 77068c26f27de7dffd960c250f18a5f440cf101c (patch) | |
tree | b23f68b43cf02650bd04c81035876d9b3c3943d4 | |
parent | bc859935247ff50842ec413e1e36ddc34796ef14 (diff) |
liberror: improve check functions
Improve the check functions by having them immediately return an "OK" result if
the incoming error code matches that of ERR_OK. Also have them test against
ERR_OK instead of hardcoding the OK value as 0.
-rw-r--r-- | lib/liberror | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/liberror b/lib/liberror index fe48938..54bf0c0 100644 --- a/lib/liberror +++ b/lib/liberror @@ -184,6 +184,9 @@ function liberror_check() { local error="$?" local info="" + # return "OK" immediately if the error code matches ERR_OK + [[ "$error" -eq "$ERR_OK" ]] && return 0 + # if we were given two parameters, the first is the error name (override), and # the second is the info message. Otherwise, the first parameter (if given) is # the info message, and error is taken from the $? resulting from whatever @@ -196,7 +199,7 @@ function liberror_check() { info="$1" fi - [[ "$error" -gt 0 ]] && liberror_print_error "$error" "$info" + liberror_print_error "$error" "$info" # return the same error back so that we don't modify the return value # environment @@ -226,6 +229,9 @@ function liberror_check_fatal() { local error="$?" local info="" + # return "OK" immediately if the error code matches ERR_OK + [[ "$error" -eq "$ERR_OK" ]] && return 0 + # if we were given two parameters, the first is the error name (override), and # the second is the info message. Otherwise, the first parameter (if given) is # the info message, and error is taken from the $? resulting from whatever @@ -238,8 +244,12 @@ function liberror_check_fatal() { info="$1" fi - [[ "$error" -gt 0 ]] && liberror_die "$error" "$info" + liberror_die "$error" "$info" + # liberror_die calls exit so we should never reach the following return + # statement + # in the event that we do reach it, we don't want to cycle errors endlessly, + # so return "OK" return $ERR_OK } |