diff options
| author | dteske <dteske@FreeBSD.org> | 2013-06-04 00:30:05 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-06-04 00:30:05 +0000 |
| commit | 01acd11dfd45723e4344700e5060530d086f2e0c (patch) | |
| tree | d48705f54e5f43fd962274bad3018ec80b3f2f75 | |
| parent | 0ffaee9c19a3964fb7cb9eb7b7d0a14407ede189 (diff) | |
| download | FreeBSD-src-01acd11dfd45723e4344700e5060530d086f2e0c.zip FreeBSD-src-01acd11dfd45723e4344700e5060530d086f2e0c.tar.gz | |
Improve debugging for f_dialog_*_constrain() to print constrained rather
than unconstrained values.
| -rw-r--r-- | usr.sbin/bsdconfig/share/dialog.subr | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr index badca9f..523ef1a 100644 --- a/usr.sbin/bsdconfig/share/dialog.subr +++ b/usr.sbin/bsdconfig/share/dialog.subr @@ -328,7 +328,7 @@ f_dialog_size_constrain() for __arg in height width; do debug= f_getvar __var_$__arg __cp [ "$__cp" ] || continue - if ! f_getvar "$__cp" __$__arg; then + if ! debug= f_getvar "$__cp" __$__arg; then f_dprintf "%s: var_%s variable \`%s' not set" \ $__fname $__arg "$__cp" __retval=$FAILURE @@ -377,6 +377,12 @@ f_dialog_size_constrain() fi fi + if [ "$debug" ]; then + # Print final constrained values to debuggin + f_quietly f_getvar "$__var_height" + f_quietly f_getvar "$__var_width" + fi + return $__retval # success if no debug warnings were printed } @@ -419,7 +425,7 @@ f_dialog_menu_constrain() for __arg in height width rows; do debug= f_getvar __var_$__arg __cp [ "$__cp" ] || continue - if ! f_getvar "$__cp" __$__arg; then + if ! debug= f_getvar "$__cp" __$__arg; then f_dprintf "%s: var_%s variable \`%s' not set" \ $__fname $__arg "$__cp" __retval=$FAILURE @@ -489,6 +495,13 @@ f_dialog_menu_constrain() fi fi + if [ "$debug" ]; then + # Print final constrained values to debuggin + f_quietly f_getvar "$__var_height" + f_quietly f_getvar "$__var_width" + f_quietly f_getvar "$__var_rows" + fi + return $__retval # success if no debug warnings were printed } |
