sysmocom
/
openwrt
11
0
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
blogic 2014-09-01 13:21:54 +00:00
parent 72b713be1b
commit cb8f6fa0b4
7 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/etc/init.d/system
View File

@ -12,8 +12,6 @@ validate_system_section()
'buffersize:uinteger' \ 'buffersize:uinteger' \
'timezone:string:UTC' \ 'timezone:string:UTC' \
'zonename:string' 'zonename:string'
return $?
} }
system_config() { system_config() {

4
package/network/config/firewall/files/firewall.init
View File

@ -15,8 +15,6 @@ validate_firewall_redirect()
'dest_ip:cidr' \ 'dest_ip:cidr' \
'dest_port:or(port, portrange)' \ 'dest_port:or(port, portrange)' \
'target:or("SNAT", "DNAT")' 'target:or("SNAT", "DNAT")'
return $?
} }
validate_firewall_rule() validate_firewall_rule()
@ -28,8 +26,6 @@ validate_firewall_rule()
'src_port:or(port, portrange)' \ 'src_port:or(port, portrange)' \
'dest_port:or(port, portrange)' \ 'dest_port:or(port, portrange)' \
'target:string' 'target:string'
return $?
} }
service_triggers() { service_triggers() {

14
package/network/config/netifd/files/etc/init.d/network
View File

@ -50,8 +50,6 @@ validate_atm_bridge_section()
'atmdev:uinteger:0' \ 'atmdev:uinteger:0' \
'encaps:or("llc", "vc"):llc' \ 'encaps:or("llc", "vc"):llc' \
'payload:or("bridged", "routed"):bridged' 'payload:or("bridged", "routed"):bridged'
return $?
} }
validate_route_section() validate_route_section()
@ -64,8 +62,6 @@ validate_route_section()
'metric:uinteger' \ 'metric:uinteger' \
'mtu:uinteger' \ 'mtu:uinteger' \
'table:or(range(0,65535),string)' 'table:or(range(0,65535),string)'
return $?
} }
validate_route6_section() validate_route6_section()
@ -77,8 +73,6 @@ validate_route6_section()
'metric:uinteger' \ 'metric:uinteger' \
'mtu:uinteger' \ 'mtu:uinteger' \
'table:or(range(0,65535),string)' 'table:or(range(0,65535),string)'
return $?
} }
validate_rule_section() validate_rule_section()
@ -94,8 +88,6 @@ validate_rule_section()
'lookup:or(range(0,65535),string)' \ 'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \ 'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")' 'action:or("prohibit", "unreachable", "blackhole", "throw")'
return $?
} }
validate_rule6_section() validate_rule6_section()
@ -111,8 +103,6 @@ validate_rule6_section()
'lookup:or(range(0,65535),string)' \ 'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \ 'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")' 'action:or("prohibit", "unreachable", "blackhole", "throw")'
return $?
} }
validate_switch_section() validate_switch_section()
@ -122,8 +112,6 @@ validate_switch_section()
'enable:bool' \ 'enable:bool' \
'enable_vlan:bool' \ 'enable_vlan:bool' \
'reset:bool' 'reset:bool'
return $?
} }
validate_switch_vlan() validate_switch_vlan()
@ -132,8 +120,6 @@ validate_switch_vlan()
'device:string' \ 'device:string' \
'vlan:uinteger' \ 'vlan:uinteger' \
'ports:list(ports)' 'ports:list(ports)'
return $?
} }
service_triggers() service_triggers()

1
package/network/services/dropbear/files/dropbear.init
View File

@ -47,7 +47,6 @@ validate_section_dropbear()
'Port:list(port):22' \ 'Port:list(port):22' \
'SSHKeepAlive:uinteger:300' \ 'SSHKeepAlive:uinteger:300' \
'IdleTimeout:uinteger:0' 'IdleTimeout:uinteger:0'
return $?
} }
dropbear_instance() dropbear_instance()

2
package/network/services/relayd/files/relay.init
View File

@ -15,8 +15,6 @@ validate_proto_relayd()
'table:range(0, 65535):16800' \ 'table:range(0, 65535):16800' \
'forward_bcast:bool:1' \ 'forward_bcast:bool:1' \
'forward_dhcp:bool:1' 'forward_dhcp:bool:1'
return $?
} }
resolve_ifname() { resolve_ifname() {

2
package/system/ubox/files/log.init
View File

@ -19,7 +19,6 @@ validate_log_section()
'log_port:port:514' \ 'log_port:port:514' \
'log_proto:or("tcp", "udp"):udp' \ 'log_proto:or("tcp", "udp"):udp' \
'log_prefix:string' 'log_prefix:string'
return $?
} }
validate_log_daemon() validate_log_daemon()
@ -27,7 +26,6 @@ validate_log_daemon()
uci_validate_section system system "${1}" \ uci_validate_section system system "${1}" \
'log_size:uinteger:0' \ 'log_size:uinteger:0' \
'log_buffer_size:uinteger:0' 'log_buffer_size:uinteger:0'
return $?
} }
start_service_daemon() start_service_daemon()

1
package/utils/busybox/files/sysntpd
View File

@ -9,7 +9,6 @@ PROG=/usr/sbin/ntpd
validate_ntp_section() { validate_ntp_section() {
uci_validate_section system timeserver "${1}" \ uci_validate_section system timeserver "${1}" \
'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0' 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0'
return $?
} }
start_service() { start_service() {