package/*: remove useless explicit set of function returncode

somebody started to set a function returncode in the validation
stuff and everybody copies it, e.g.

myfunction()
{
	fire_command

	return $?
}

a function automatically returns with the last returncode,
so we can safely remove the command 'return $?'. reference:

http://tldp.org/LDP/abs/html/exit-status.html
"The last command executed in the function or script determines the exit status."

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
Backport of r42278

SVN-Revision: 42379

diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
index 24a9fdee6867f70946173c5509b7a43c6a83378c..6388d62ea29e4c8635e8396360a8fb7e36725d9a 100755 (executable)
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -12,8 +12,6 @@ validate_system_section()
                'buffersize:uinteger' \
                'timezone:string:UTC' \
                'zonename:string'
-
-       return $?
 }
 
 system_config() {

diff --git a/package/network/config/firewall/files/firewall.init b/package/network/config/firewall/files/firewall.init
index 662dd8010b1328ae3c8ec5533405171b94d94bd0..ee3ed1a28356759e71930ebc2bb0158451e0a7d3 100755 (executable)
--- a/package/network/config/firewall/files/firewall.init
+++ b/package/network/config/firewall/files/firewall.init
@@ -15,8 +15,6 @@ validate_firewall_redirect()
                'dest_ip:cidr' \
                'dest_port:or(port, portrange)' \
                'target:or("SNAT", "DNAT")'
-       
-       return $?
 }
 
 validate_firewall_rule()
@@ -28,8 +26,6 @@ validate_firewall_rule()
                'src_port:or(port, portrange)' \
                'dest_port:or(port, portrange)' \
                'target:string'
-       
-       return $?
 }
 
 service_triggers() {

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index 8a7427bacd585a96ffa82c3c2a3670ce9572cd12..1d8a5b34efe132445a32f1fa7676955890b76025 100755 (executable)
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -50,8 +50,6 @@ validate_atm_bridge_section()
                'atmdev:uinteger:0' \
                'encaps:or("llc", "vc"):llc' \
                'payload:or("bridged", "routed"):bridged'
-
-       return $?
 }
 
 validate_route_section()
@@ -64,8 +62,6 @@ validate_route_section()
                'metric:uinteger' \
                'mtu:uinteger' \
                'table:or(range(0,65535),string)'
-
-       return $?
 }
 
 validate_route6_section()
@@ -77,8 +73,6 @@ validate_route6_section()
                'metric:uinteger' \
                'mtu:uinteger' \
                'table:or(range(0,65535),string)'
-
-       return $?
 }
 
 validate_rule_section()
@@ -94,8 +88,6 @@ validate_rule_section()
                'lookup:or(range(0,65535),string)' \
                'goto:range(0,65535)' \
                'action:or("prohibit", "unreachable", "blackhole", "throw")'
-
-       return $?
 }
 
 validate_rule6_section()
@@ -111,8 +103,6 @@ validate_rule6_section()
                'lookup:or(range(0,65535),string)' \
                'goto:range(0,65535)' \
                'action:or("prohibit", "unreachable", "blackhole", "throw")'
-
-       return $?
 }
 
 validate_switch_section()
@@ -122,8 +112,6 @@ validate_switch_section()
                'enable:bool' \
                'enable_vlan:bool' \
                'reset:bool'
-
-       return $?
 }
 
 validate_switch_vlan()
@@ -132,8 +120,6 @@ validate_switch_vlan()
                'device:string' \
                'vlan:uinteger' \
                'ports:list(ports)'
-
-       return $?
 }
 
 service_triggers()

diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
index 5206426ec30075e98c23ab7d159ecce9587b8b71..c6f3d9ba82d51cbdc7790cb984d2e7aca1588038 100755 (executable)
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -47,7 +47,6 @@ validate_section_dropbear()
                'Port:list(port):22' \
                'SSHKeepAlive:uinteger:300' \
                'IdleTimeout:uinteger:0'
-       return $?
 }
 
 dropbear_instance()

diff --git a/package/network/services/relayd/files/relay.init b/package/network/services/relayd/files/relay.init
index e193312e6edd1fdd27534f6963892fbf0c37e366..e38143f6e733c4700ee05e299a7e8522f373ff07 100644 (file)
--- a/package/network/services/relayd/files/relay.init
+++ b/package/network/services/relayd/files/relay.init
@@ -15,8 +15,6 @@ validate_proto_relayd()
                'table:range(0, 65535):16800' \
                'forward_bcast:bool:1' \
                'forward_dhcp:bool:1'
-
-       return $?
 }
 
 resolve_ifname() {

diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init
index be382972e3424098f5435847622389aa9299ae43..3e06fa5b49835d234d878bb77a8b712b9ac92788 100644 (file)
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -19,7 +19,6 @@ validate_log_section()
                'log_port:port:514' \
                'log_proto:or("tcp", "udp"):udp' \
                'log_prefix:string'
-       return $?
 }
 
 validate_log_daemon()
@@ -27,7 +26,6 @@ validate_log_daemon()
        uci_validate_section system system "${1}" \
                'log_size:uinteger:0' \
                'log_buffer_size:uinteger:0'
-       return $?
 }
 
 start_service_daemon()

diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
index 1878c3f59472306a2c5decd5c1243a6201d13908..417addfb1ca5c0235b8554de1a4368a1385d7964 100755 (executable)
--- a/package/utils/busybox/files/sysntpd
+++ b/package/utils/busybox/files/sysntpd
@@ -9,7 +9,6 @@ PROG=/usr/sbin/ntpd
 validate_ntp_section() {
        uci_validate_section system timeserver "${1}" \
                'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0'
-       return $?
 }
 
 start_service() {