From 8d5bfc4679824ca505f5982ee602e5b79774f890 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Tue, 25 Dec 2018 22:41:19 -0500 Subject: libopkbuild: Move function definitions before points of use --- (limited to 'lib/changelog.sh') diff --git a/lib/changelog.sh b/lib/changelog.sh index e8da1f4..aea567c 100644 --- a/lib/changelog.sh +++ b/lib/changelog.sh @@ -24,6 +24,45 @@ OB_CHANGELOG_CHANGES= OB_CHANGELOG_MAINTAINER= OB_CHANGELOG_DATE= +_ob_parse_changelog_error() +{ + local file= + local line_nr= + local msg_id= + local file_info= + local orig_text_domain= + + file="${1}" + line_nr="${2}" + msg_id="${3}" + shift 3 + + file_info="$(printf '%20s(l%d):' "${file}" "${line_nr}")" + + orig_text_domain="$(ob_get_text_domain)" + ob_set_text_domain "${_OB_INTERNAL_TEXT_DOMAIN}" + + ob_warn "${file_info} $(ob_get_msg "${msg_id}")" "${@}" + + ob_set_text_domain "${orig_text_domain}" + + return 0 +} + +_ob_get_changelog_expect_str() +{ + local orig_text_domain= + + orig_text_domain="$(ob_get_text_domain)" + ob_set_text_domain "${_OB_INTERNAL_TEXT_DOMAIN}" + + echo "$(ob_get_msg "changelog_expect_${1}")" + + ob_set_text_domain "${orig_text_domain}" + + return 0 +} + ob_parse_changelog() { local file= @@ -162,42 +201,3 @@ ${blank_lines}${line}" return 0 } - -_ob_parse_changelog_error() -{ - local file= - local line_nr= - local msg_id= - local file_info= - local orig_text_domain= - - file="${1}" - line_nr="${2}" - msg_id="${3}" - shift 3 - - file_info="$(printf '%20s(l%d):' "${file}" "${line_nr}")" - - orig_text_domain="$(ob_get_text_domain)" - ob_set_text_domain "${_OB_INTERNAL_TEXT_DOMAIN}" - - ob_warn "${file_info} $(ob_get_msg "${msg_id}")" "${@}" - - ob_set_text_domain "${orig_text_domain}" - - return 0 -} - -_ob_get_changelog_expect_str() -{ - local orig_text_domain= - - orig_text_domain="$(ob_get_text_domain)" - ob_set_text_domain "${_OB_INTERNAL_TEXT_DOMAIN}" - - echo "$(ob_get_msg "changelog_expect_${1}")" - - ob_set_text_domain "${orig_text_domain}" - - return 0 -} -- cgit v0.9.1