From fa784c1df66b7f89c1fc1bdf76ff7bcae8e7fa83 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 22 Jul 2017 14:54:25 -0400 Subject: src/*.sh: Drop inclusion guards --- diff --git a/src/cmd.sh b/src/cmd.sh index 9b17693..779a8f2 100644 --- a/src/cmd.sh +++ b/src/cmd.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_CMD_SM+set}" = 'xset' ] && return 0 -_CMD_SM=1 - cmds= load_cmds() diff --git a/src/control.sh b/src/control.sh index a49ea98..3fe00d4 100644 --- a/src/control.sh +++ b/src/control.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_CONTROL_SM+set}" = 'xset' ] && return 0 -_CONTROL_SM=1 - control_file= control_line_nr= diff --git a/src/db.sh b/src/db.sh index cd91840..291f9b8 100644 --- a/src/db.sh +++ b/src/db.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_DB_SM+set}" = 'xset' ] && return 0 -_DB_SM=1 - # # Functions for the suites indices # diff --git a/src/dir.sh b/src/dir.sh index 0b866c0..b72d786 100644 --- a/src/dir.sh +++ b/src/dir.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_DIR_SM+set}" = 'xset' ] && return 0 -_DIR_SM=1 - hash_name() { local name="${1}" diff --git a/src/garbage.sh b/src/garbage.sh index 1af64bd..0cf8afe 100644 --- a/src/garbage.sh +++ b/src/garbage.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_GARBAGE_SM+set}" = 'xset' ] && return 0 -_GARBAGE_SM=1 - collect_garbage() { local cur_time= diff --git a/src/include.sh b/src/include.sh index 14476ee..e83b41d 100644 --- a/src/include.sh +++ b/src/include.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_INCLUDE_SM+set}" = 'xset' ] && return 0 -_INCLUDE_SM=1 - _INCLUDE_CHANGES_FIELDS='Format Source Binary Version Architecture Platform Distribution Maintainer Changed-By Date Description Changes Files' diff --git a/src/index.sh b/src/index.sh index 13d206b..a975e7c 100644 --- a/src/index.sh +++ b/src/index.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_INDEX_SM+set}" = 'xset' ] && return 0 -_INDEX_SM=1 - feed_add_package() { local chan="${1}" diff --git a/src/locale.sh b/src/locale.sh index e3949a6..f7cc0a5 100644 --- a/src/locale.sh +++ b/src/locale.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_LOCALE_SM+set}" = 'xset' ] && return 0 -_LOCALE_SM=1 - DEFAULT_LOCALE='en_US' load_locale() diff --git a/src/output.sh b/src/output.sh index d3d150f..da3a7d5 100644 --- a/src/output.sh +++ b/src/output.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_OUTPUT_SM+set}" = 'xset' ] && return 0 -_OUTPUT_SM=1 - error() { local status=${1} diff --git a/src/remove.sh b/src/remove.sh index 1cd6431..b580b1b 100644 --- a/src/remove.sh +++ b/src/remove.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_REMOVE_SM+set}" = 'xset' ] && return 0 -_REMOVE_SM=1 - remove_source_from_suite() { local chan="${1}" diff --git a/src/suite.sh b/src/suite.sh index 5d00914..da4a02d 100644 --- a/src/suite.sh +++ b/src/suite.sh @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -[ "x${_SUITE_SM+set}" = 'xset' ] && return 0 -_SUITE_SM=1 - copy_suite() { local src_chan="${1}" -- cgit v0.9.1