Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make this compile again with -DNO_PROGRESS

Browse Source
This commit is contained in:
christos 2019-06-22 23:40:33 +00:00
parent d33bb7af26
commit 9bedb72e28
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/ftp/progressbar.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $ */ /* $NetBSD: progressbar.c,v 1.23 2019/06/22 23:40:33 christos Exp $ */
/*- /*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc. * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $"); __RCSID("$NetBSD: progressbar.c,v 1.23 2019/06/22 23:40:33 christos Exp $");
#endif /* not lint */ #endif /* not lint */
/* /*
@ -87,6 +87,7 @@ updateprogressmeter(int dummy)
/* /*
* List of order of magnitude suffixes, per IEC 60027-2. * List of order of magnitude suffixes, per IEC 60027-2.
*/ */
#if !defined(NO_PROGRESS) || !defined(STANDALONE_PROGRESS)
static const char * const suffixes[] = { static const char * const suffixes[] = {
"", /* 2^0 (byte) */ "", /* 2^0 (byte) */
"KiB", /* 2^10 Kibibyte */ "KiB", /* 2^10 Kibibyte */
@ -102,6 +103,7 @@ static const char * const suffixes[] = {
#endif #endif
}; };
#define NSUFFIXES (int)(sizeof(suffixes) / sizeof(suffixes[0])) #define NSUFFIXES (int)(sizeof(suffixes) / sizeof(suffixes[0]))
#endif
/* /*
* Display a transfer progress bar if progress is non-zero. * Display a transfer progress bar if progress is non-zero.
@ -139,8 +141,10 @@ progressmeter(int flag)
* these appropriately. * these appropriately.
*/ */
#endif #endif
#if !defined(NO_PROGRESS) || !defined(STANDALONE_PROGRESS)
size_t len; size_t len;
char buf[256]; /* workspace for progress bar */ char buf[256]; /* workspace for progress bar */
#endif
#ifndef NO_PROGRESS #ifndef NO_PROGRESS
#define BAROVERHEAD 45 /* non `*' portion of progress bar */ #define BAROVERHEAD 45 /* non `*' portion of progress bar */
/* /*