d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve debugging for f_dialog_*_constrain() to print constrained rather

Browse Source 
than unconstrained values.
This commit is contained in:
Devin Teske 2013-06-04 00:30:05 +00:00
parent 5a37b9e138
commit 790062d26b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/bsdconfig/share/dialog.subr
View File

@ -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
}