Author: dteske
Date: Thu Jun 20 05:51:44 2013
New Revision: 252020
URL: http://svnweb.freebsd.org/changeset/base/252020
Log:
When the fall-back of a case-statement is the last thing executed in a
while-loop _and_ all prior matches in the same case-statement either break
or continue, we can safely break the fall-back out of the case-statement.
This should improve readability and allow for longer-lines by reducing the
level of indentation by-one for the fall-back case.
(a continuation of SVN r252019)
Modified:
head/usr.sbin/bsdconfig/startup/rcvar
head/usr.sbin/bsdconfig/usermgmt/groupdel
Modified: head/usr.sbin/bsdconfig/startup/rcvar
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcvar Thu Jun 20 05:48:08 2013
(r252019)
+++ head/usr.sbin/bsdconfig/startup/rcvar Thu Jun 20 05:51:44 2013
(r252020)
@@ -197,21 +197,20 @@ while :; do
dialog_menu_main || f_die
f_dialog_menutag_fetch mtag
- case "$mtag" in
- "X $msg_exit") break ;;
- *) # Anything else is an rcvar to toggle
- rcvar="${mtag# }"
- f_dialog_menuitem_fetch value
-
- # Determine the new [toggled] value to use
- case "$value" in
- "[X]"*) value="NO" ;;
- *) value="YES"
- esac
+ [ "$mtag" = "X $msg_exit" ] && break
- err=$( f_sysrc_set "$rcvar" "$value" 2>&1 ) ||
- f_dialog_msgbox "$err"
+ # Anything else is an rcvar to toggle
+
+ rcvar="${mtag# }"
+ f_dialog_menuitem_fetch value
+
+ # Determine the new [toggled] value to use
+ case "$value" in
+ "[X]"*) value="NO" ;;
+ *) value="YES"
esac
+
+ err=$( f_sysrc_set "$rcvar" "$value" 2>&1 ) || f_dialog_msgbox "$err"
done
exit $SUCCESS
Modified: head/usr.sbin/bsdconfig/usermgmt/groupdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupdel Thu Jun 20 05:48:08 2013
(r252019)
+++ head/usr.sbin/bsdconfig/usermgmt/groupdel Thu Jun 20 05:51:44 2013
(r252020)
@@ -77,13 +77,12 @@ while :; do
[ $retval -eq 0 ] || f_die
- case "$mtag" in
- "X $msg_exit") break ;;
- *) # anything else is a group name
- $BSDCFG_LIBE/$APP_DIR/groupinput \
- ${USE_XDIALOG:+-X} mode="Delete" group="$mtag"
- ;;
- esac
+ [ "$mtag" = "X $msg_exit" ] && break
+
+ # Anything else is a group name
+
+ $BSDCFG_LIBE/$APP_DIR/groupinput \
+ ${USE_XDIALOG:+-X} mode="Delete" group="$mtag"
done
exit $SUCCESS
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
