From cac8854eb63246d5a007ee9de3ca4c5663c20e08 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sat, 30 Apr 2016 20:05:23 +0000
Subject: [PATCH] restore: use our howmany() instead of reinventing the macro.

---
 sbin/restore/interactive.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 05d1a5806a1..6f4c02e403a 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -55,8 +55,6 @@ __FBSDID("$FreeBSD$");
 #include "restore.h"
 #include "extern.h"
 
-#define round(a, b) (((a) + (b) - 1) / (b) * (b))
-
 /*
  * Things to handle interruptions.
  */
@@ -671,7 +669,7 @@ formatf(struct afile *list, int nentry)
 	columns = 81 / width;
 	if (columns == 0)
 		columns = 1;
-	lines = (nentry + columns - 1) / columns;
+	lines = howmany(nentry, columns);
 	for (i = 0; i < lines; i++) {
 		for (j = 0; j < columns; j++) {
 			fp = &list[j * lines + i];