diff options
author | dteske <dteske@FreeBSD.org> | 2013-06-24 20:58:54 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2013-06-24 20:58:54 +0000 |
commit | b023066a1dfe3db9bdd5128fc8bfb22fe7af54a9 (patch) | |
tree | 1967c7f4c866b4ec9b293d0c52582771e2af5cc7 /usr.sbin/bsdconfig/networking | |
parent | 8cfebcfd45a3da9b3fa8ef2bb3a000c4923440af (diff) | |
download | FreeBSD-src-b023066a1dfe3db9bdd5128fc8bfb22fe7af54a9.zip FreeBSD-src-b023066a1dfe3db9bdd5128fc8bfb22fe7af54a9.tar.gz |
More whitespace.
Diffstat (limited to 'usr.sbin/bsdconfig/networking')
-rwxr-xr-x | usr.sbin/bsdconfig/networking/defaultrouter | 2 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/networking/devices | 2 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/networking/hostname | 2 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/networking/nameservers | 2 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/networking/networking | 2 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/share/device.subr | 8 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/share/hostname.subr | 11 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/share/ipaddr.subr | 16 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/share/media.subr | 2 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/share/netmask.subr | 10 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/networking/share/resolv.subr | 8 |
11 files changed, 33 insertions, 32 deletions
diff --git a/usr.sbin/bsdconfig/networking/defaultrouter b/usr.sbin/bsdconfig/networking/defaultrouter index 5b8ebdc..6f37194 100755 --- a/usr.sbin/bsdconfig/networking/defaultrouter +++ b/usr.sbin/bsdconfig/networking/defaultrouter @@ -51,7 +51,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) # while getopts h$GETOPTS_STDARGS flag; do case "$flag" in - h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";; + h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;; esac done shift $(( $OPTIND - 1 )) diff --git a/usr.sbin/bsdconfig/networking/devices b/usr.sbin/bsdconfig/networking/devices index 9da736e..c19d0a2 100755 --- a/usr.sbin/bsdconfig/networking/devices +++ b/usr.sbin/bsdconfig/networking/devices @@ -56,7 +56,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) # while getopts h$GETOPTS_STDARGS flag; do case "$flag" in - h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";; + h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;; esac done shift $(( $OPTIND - 1 )) diff --git a/usr.sbin/bsdconfig/networking/hostname b/usr.sbin/bsdconfig/networking/hostname index 55cc438..4faa3b0 100755 --- a/usr.sbin/bsdconfig/networking/hostname +++ b/usr.sbin/bsdconfig/networking/hostname @@ -54,7 +54,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) # while getopts h$GETOPTS_STDARGS flag; do case "$flag" in - h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";; + h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;; esac done shift $(( $OPTIND - 1 )) diff --git a/usr.sbin/bsdconfig/networking/nameservers b/usr.sbin/bsdconfig/networking/nameservers index d1b8123..d83c824 100755 --- a/usr.sbin/bsdconfig/networking/nameservers +++ b/usr.sbin/bsdconfig/networking/nameservers @@ -54,7 +54,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) # while getopts h$GETOPTS_STDARGS flag; do case "$flag" in - h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";; + h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;; esac done shift $(( $OPTIND - 1 )) diff --git a/usr.sbin/bsdconfig/networking/networking b/usr.sbin/bsdconfig/networking/networking index 36122ca..f73d4d2 100755 --- a/usr.sbin/bsdconfig/networking/networking +++ b/usr.sbin/bsdconfig/networking/networking @@ -100,7 +100,7 @@ dialog_menu_main() # while getopts h$GETOPTS_STDARGS flag; do case "$flag" in - h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";; + h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;; esac done shift $(( $OPTIND - 1 )) diff --git a/usr.sbin/bsdconfig/networking/share/device.subr b/usr.sbin/bsdconfig/networking/share/device.subr index 37ec9f1..133bca0 100644 --- a/usr.sbin/bsdconfig/networking/share/device.subr +++ b/usr.sbin/bsdconfig/networking/share/device.subr @@ -261,7 +261,7 @@ f_dialog_menu_netdev_edit() # read and display in the summary dialog. # case "$tag" in - X\ *) break;; + X\ *) break ;; 2\ *) # # Do not proceed if/when there are NFS-mounts currently # active. If the network is changed while NFS-exported @@ -313,11 +313,11 @@ f_dialog_menu_netdev_edit() fi ;; 3\ *) f_dialog_input_ipaddr "$interface" "$ipaddr" - [ $? -eq $SUCCESS ] && dhcp=;; + [ $? -eq $SUCCESS ] && dhcp= ;; 4\ *) f_dialog_input_netmask "$interface" "$netmask" - [ $? -eq $SUCCESS -a "$_netmask" ] && dhcp=;; + [ $? -eq $SUCCESS -a "$_netmask" ] && dhcp= ;; 5\ *) f_dialog_menu_media_options "$interface" "$options" - [ $? -eq $SUCCESS ] && dhcp=;; + [ $? -eq $SUCCESS ] && dhcp= ;; esac done diff --git a/usr.sbin/bsdconfig/networking/share/hostname.subr b/usr.sbin/bsdconfig/networking/share/hostname.subr index 9ffa42e..1934ee1 100644 --- a/usr.sbin/bsdconfig/networking/share/hostname.subr +++ b/usr.sbin/bsdconfig/networking/share/hostname.subr @@ -53,11 +53,12 @@ f_dialog_hnerror() [ ${error:-0} -ne 0 ] || return $SUCCESS case "$error" in - 1) f_show_msg "$msg_hostname_label_contains_invalid_chars" "$fqhn";; - 2) f_show_msg "$msg_hostname_label_starts_or_ends_with_hyphen" "$fqhn";; - 3) f_show_msg "$msg_hostname_label_is_null" "$fqhn";; - 63) f_show_msg "$msg_hostname_label_exceeds_max_length" "$fqhn";; - 255) f_show_msg "$msg_hostname_exceeds_max_length" "$fqhn";; + 1) f_show_msg "$msg_hostname_label_contains_invalid_chars" "$fqhn" ;; + 2) f_show_msg \ + "$msg_hostname_label_starts_or_ends_with_hyphen" "$fqhn" ;; + 3) f_show_msg "$msg_hostname_label_is_null" "$fqhn" ;; + 63) f_show_msg "$msg_hostname_label_exceeds_max_length" "$fqhn" ;; + 255) f_show_msg "$msg_hostname_exceeds_max_length" "$fqhn" ;; esac } diff --git a/usr.sbin/bsdconfig/networking/share/ipaddr.subr b/usr.sbin/bsdconfig/networking/share/ipaddr.subr index 9d95b30..68d0ec1 100644 --- a/usr.sbin/bsdconfig/networking/share/ipaddr.subr +++ b/usr.sbin/bsdconfig/networking/share/ipaddr.subr @@ -52,10 +52,10 @@ f_dialog_iperror() [ ${error:-0} -ne 0 ] || return $SUCCESS case "$error" in - 1) f_show_msg "$msg_ipv4_addr_octet_contains_invalid_chars" "$ip";; - 2) f_show_msg "$msg_ipv4_addr_octet_is_null" "$ip";; - 3) f_show_msg "$msg_ipv4_addr_octet_exceeds_max_value" "$ip";; - 4) f_show_msg "$msg_ipv4_addr_octet_missing_or_extra" "$ip";; + 1) f_show_msg "$msg_ipv4_addr_octet_contains_invalid_chars" "$ip" ;; + 2) f_show_msg "$msg_ipv4_addr_octet_is_null" "$ip" ;; + 3) f_show_msg "$msg_ipv4_addr_octet_exceeds_max_value" "$ip" ;; + 4) f_show_msg "$msg_ipv4_addr_octet_missing_or_extra" "$ip" ;; esac } @@ -91,10 +91,10 @@ f_dialog_ip6error() [ ${error:-0} -ne 0 ] || return $SUCCESS case "$error" in - 1) f_show_msg "$msg_ipv6_addr_segment_contains_invalid_chars" "$ip";; - 2) f_show_msg "$msg_ipv6_addr_too_many_null_segments" "$ip";; - 3) f_show_msg "$msg_ipv6_addr_segment_contains_too_many_chars" "$ip";; - 4) f_show_msg "$msg_ipv6_addr_too_few_or_extra_segments" "$ip";; + 1) f_show_msg "$msg_ipv6_addr_segment_contains_invalid_chars" "$ip" ;; + 2) f_show_msg "$msg_ipv6_addr_too_many_null_segments" "$ip" ;; + 3) f_show_msg "$msg_ipv6_addr_segment_contains_too_many_chars" "$ip" ;; + 4) f_show_msg "$msg_ipv6_addr_too_few_or_extra_segments" "$ip" ;; *) if [ $(( $error & 0xF )) -eq 5 ]; then # IPv4 at the end of IPv6 address is invalid diff --git a/usr.sbin/bsdconfig/networking/share/media.subr b/usr.sbin/bsdconfig/networking/share/media.subr index ad467d8..22073d7 100644 --- a/usr.sbin/bsdconfig/networking/share/media.subr +++ b/usr.sbin/bsdconfig/networking/share/media.subr @@ -68,7 +68,7 @@ f_ifconfig_options() output= while [ $# -gt 0 ]; do case "$1" in - inet|netmask) shift 1;; + inet|netmask) shift 1 ;; *) output="$output${output:+ }$1" esac shift 1 diff --git a/usr.sbin/bsdconfig/networking/share/netmask.subr b/usr.sbin/bsdconfig/networking/share/netmask.subr index c52fb37..5a4c7a3 100644 --- a/usr.sbin/bsdconfig/networking/share/netmask.subr +++ b/usr.sbin/bsdconfig/networking/share/netmask.subr @@ -52,11 +52,11 @@ f_dialog_maskerror() [ ${error:-0} -ne 0 ] || return $SUCCESS case "$error" in - 1) f_show_msg "$msg_ipv4_mask_field_contains_invalid_chars" "$mask";; - 2) f_show_msg "$msg_ipv4_mask_field_is_null" "$mask";; - 3) f_show_msg "$msg_ipv4_mask_field_exceeds_max_value" "$mask";; - 4) f_show_msg "$msg_ipv4_mask_field_missing_or_extra" "$mask";; - 5) f_show_msg "$msg_ipv4_mask_field_invalid_value" "$mask";; + 1) f_show_msg "$msg_ipv4_mask_field_contains_invalid_chars" "$mask" ;; + 2) f_show_msg "$msg_ipv4_mask_field_is_null" "$mask" ;; + 3) f_show_msg "$msg_ipv4_mask_field_exceeds_max_value" "$mask" ;; + 4) f_show_msg "$msg_ipv4_mask_field_missing_or_extra" "$mask" ;; + 5) f_show_msg "$msg_ipv4_mask_field_invalid_value" "$mask" ;; esac } diff --git a/usr.sbin/bsdconfig/networking/share/resolv.subr b/usr.sbin/bsdconfig/networking/share/resolv.subr index 2a1218a..866f345 100644 --- a/usr.sbin/bsdconfig/networking/share/resolv.subr +++ b/usr.sbin/bsdconfig/networking/share/resolv.subr @@ -370,11 +370,11 @@ f_dialog_input_nameserver() # local retval=$? case $retval in - 1) f_die 1 "$msg_internal_error_nsindex_value" "$nsindex";; + 1) f_die 1 "$msg_internal_error_nsindex_value" "$nsindex" ;; 2) f_dialog_msgbox "$msg_resolv_conf_changed_while_editing" - return $retval;; + return $retval ;; 3) f_dialog_msgbox "$msg_resolv_conf_entry_no_longer_exists" - return $retval;; + return $retval ;; esac # @@ -460,7 +460,7 @@ f_dialog_menu_nameservers() fi case "$tag" in - "X $msg_exit") break;; + "X $msg_exit") break ;; "A $msg_add") f_dialog_input_nameserver ;; |