mirror of https://github.com/hak5/openwrt-owl.git
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> SVN-Revision: 42278owl
parent
fdc41e2fd7
commit
2ae05c57f8
|
@ -12,8 +12,6 @@ validate_system_section()
|
|||
'buffersize:uinteger' \
|
||||
'timezone:string:UTC' \
|
||||
'zonename:string'
|
||||
|
||||
return $?
|
||||
}
|
||||
|
||||
system_config() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -47,7 +47,6 @@ validate_section_dropbear()
|
|||
'Port:list(port):22' \
|
||||
'SSHKeepAlive:uinteger:300' \
|
||||
'IdleTimeout:uinteger:0'
|
||||
return $?
|
||||
}
|
||||
|
||||
dropbear_instance()
|
||||
|
|
|
@ -15,8 +15,6 @@ validate_proto_relayd()
|
|||
'table:range(0, 65535):16800' \
|
||||
'forward_bcast:bool:1' \
|
||||
'forward_dhcp:bool:1'
|
||||
|
||||
return $?
|
||||
}
|
||||
|
||||
resolve_ifname() {
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue