Author: dteske
Date: Thu Jun 20 05:42:21 2013
New Revision: 252018
URL: http://svnweb.freebsd.org/changeset/base/252018
Log:
Remove pedanticism and consolidate some logic.
Modified:
head/usr.sbin/bsdconfig/startup/rcdelete
Modified: head/usr.sbin/bsdconfig/startup/rcdelete
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcdelete Thu Jun 20 05:40:11 2013
(r252017)
+++ head/usr.sbin/bsdconfig/startup/rcdelete Thu Jun 20 05:42:21 2013
(r252018)
@@ -367,19 +367,16 @@ while :; do
[ "$( eval echo \$_${var}_delete )" ] || continue
delete_vars="$delete_vars${delete_vars:+ }$var"
done
- unset var # no longer needed
if dialog_menu_confirm_delete $delete_vars; then
f_dialog_title "$msg_info"
f_dialog_info "$msg_deleting_selected_directives"
f_dialog_title_restore
for var in $delete_vars; do
- err=$( f_sysrc_delete $var 2>&1 )
- if [ $? -ne $SUCCESS ]; then
+ if ! err=$( f_sysrc_delete $var 2>&1 ); then
f_dialog_msgbox "$err\n"
break
fi
done
- unset var # no longer needed
dialog_create_main
fi
;;
@@ -388,7 +385,6 @@ while :; do
setvar _${var}_delete 1
export _${var}_delete
done
- unset var # no longer needed
;;
"> $msg_none")
var_list=$( set | awk -F= "
@@ -398,7 +394,6 @@ while :; do
}"
)
[ "$var_list" ] && unset $var_list
- unset var_list # no longer needed
;;
*) # Anything else is a variable to edit
var="${mtag# }"
@@ -410,7 +405,6 @@ while :; do
setvar _${var}_delete 1
export _${var}_delete
fi
- unset var # no longer needed
esac
done
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
