aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-09-01 13:21:54 +0000
committerJohn Crispin <blogic@openwrt.org>2014-09-01 13:21:54 +0000
commit78afb6f6f698dfa245da8a4de1fec51234e0e67c (patch)
treeed4d2fed027aa3e5eac109458d8e29552d5b3826 /package/network
parent0669f69d5c953b659b89e07e7ce333f8b85fec11 (diff)
downloadupstream-78afb6f6f698dfa245da8a4de1fec51234e0e67c.tar.gz
upstream-78afb6f6f698dfa245da8a4de1fec51234e0e67c.tar.bz2
upstream-78afb6f6f698dfa245da8a4de1fec51234e0e67c.zip
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 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42379 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network')
-rwxr-xr-xpackage/network/config/firewall/files/firewall.init4
-rwxr-xr-xpackage/network/config/netifd/files/etc/init.d/network14
-rwxr-xr-xpackage/network/services/dropbear/files/dropbear.init1
-rw-r--r--package/network/services/relayd/files/relay.init2
4 files changed, 0 insertions, 21 deletions
diff --git a/package/network/config/firewall/files/firewall.init b/package/network/config/firewall/files/firewall.init
index 662dd8010b..ee3ed1a283 100755
--- 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 8a7427bacd..1d8a5b34ef 100755
--- 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 5206426ec3..c6f3d9ba82 100755
--- 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 e193312e6e..e38143f6e7 100644
--- 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() {