display_setup: columns are not used for anything

4 files changed, 7 insertions, 8 deletions

diff --git a/src/share/poudriere/include/display.sh b/src/share/poudriere/include/display.sh
index 59be1523..83c4a177 100644
--- a/src/share/poudriere/include/display.sh
+++ b/src/share/poudriere/include/display.sh
@@ -25,10 +25,9 @@
 # SUCH DAMAGE.
 
 display_setup() {
-	[ $# -ge 2 ] || eargs display_setup format columns [column_sort]
+	[ $# -ge 1 ] || eargs display_setup format [column_sort]
 	_DISPLAY_DATA=
 	_DISPLAY_FORMAT="$1"
-	_DISPLAY_COLUMNS="$2"
 	_DISPLAY_COLUMN_SORT="${3-}"
 }
 
@@ -126,6 +125,6 @@ display_output() {
 		printf "${format}\n" "$@"
 	done
 
-	unset _DISPLAY_DATA _DISPLAY_FORMAT _DISPLAY_COLUMNS \
+	unset _DISPLAY_DATA _DISPLAY_FORMAT \
 	    _DISPLAY_COLUMN_SORT
 }
diff --git a/src/share/poudriere/jail.sh b/src/share/poudriere/jail.sh
index ba521246..3374bb86 100755
--- a/src/share/poudriere/jail.sh
+++ b/src/share/poudriere/jail.sh
@@ -94,12 +94,12 @@ list_jail() {
 
 	if [ ${NAMEONLY} -eq 0 ]; then
 		format='%%-%ds %%-%ds %%-%ds %%-%ds %%-%ds %%s'
-		display_setup "${format}" 6 "-d -k2,2 -k3,3 -k1,1"
+		display_setup "${format}" "-d -k2,2 -k3,3 -k1,1"
 		display_add "JAILNAME" "VERSION" "ARCH" "METHOD" \
 		    "TIMESTAMP" "PATH"
 	else
 		format='%s'
-		display_setup "${format}" 1 "-d"
+		display_setup "${format}" "-d"
 		display_add JAILNAME
 	fi
 	[ -d ${POUDRIERED}/jails ] || return 0
diff --git a/src/share/poudriere/ports.sh b/src/share/poudriere/ports.sh
index bd2a21ec..0ee72948 100755
--- a/src/share/poudriere/ports.sh
+++ b/src/share/poudriere/ports.sh
@@ -194,11 +194,11 @@ case $COMMAND in
 list)
 	if [ ${NAMEONLY} -eq 0 ]; then
 		format='%%-%ds %%-%ds %%-%ds %%s\n'
-		display_setup "${format}" 4 "-d"
+		display_setup "${format}" "-d"
 		display_add "PORTSTREE" "METHOD" "TIMESTAMP" "PATH"
 	else
 		format='%s'
-		display_setup "${format}" 1 "-d"
+		display_setup "${format}" "-d"
 		display_add "PORTSTREE"
 	fi
 	while read ptname ptmethod ptpath; do
diff --git a/src/share/poudriere/status.sh b/src/share/poudriere/status.sh
index 18e4e655..dff47d8e 100755
--- a/src/share/poudriere/status.sh
+++ b/src/share/poudriere/status.sh
@@ -191,7 +191,7 @@ show_summary() {
 		[ ${COMPACT} -eq 0 ] && format="${format}\t%s"
 	fi
 
-	display_setup "${format}" "${columns}" "-d -k1,1 -k2,2 -k3,3n -k4,4n"
+	display_setup "${format}" "-d -k1,1 -k2,2 -k3,3n -k4,4n"
 
 	if [ ${COMPACT} -eq 0 ]; then
 		if [ -n "${URL_BASE}" ] && [ ${URL} -eq 1 ]; then