relax usage of the progress API

Since it is now OK to pass a null pointer to display_progress() and
stop_progress() resulting in a no-op, then we can simplify the code
and remove a bunch of lines by not making those calls conditional all
the time.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Pitre
2007-10-30 14:57:33 -04:00
committed by Junio C Hamano
parent dc6a0757c4
commit 4d4fcc5451
5 changed files with 20 additions and 38 deletions

View File

@ -15,8 +15,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
struct dirent *de;
char hex[40];
if (opts == VERBOSE)
display_progress(progress, i + 1);
display_progress(progress, i + 1);
sprintf(hex, "%02x", i);
while ((de = readdir(dir)) != NULL) {
@ -64,8 +63,7 @@ void prune_packed_objects(int opts)
prune_dir(i, d, pathname, len + 3, opts);
closedir(d);
}
if (opts == VERBOSE)
stop_progress(&progress);
stop_progress(&progress);
}
int cmd_prune_packed(int argc, const char **argv, const char *prefix)