- wrap label GET_COUNT in #if ENABLE_FEATURE_FANCY_applet to avoid warning
about unused label.
This commit is contained in:
@ -33,7 +33,7 @@
|
||||
|
||||
static const char head_opts[] =
|
||||
"n:"
|
||||
#ifdef CONFIG_FEATURE_FANCY_HEAD
|
||||
#if ENABLE_FEATURE_FANCY_HEAD
|
||||
"c:qv"
|
||||
#endif
|
||||
;
|
||||
@ -44,7 +44,7 @@ int head_main(int argc, char **argv)
|
||||
{
|
||||
unsigned long count = 10;
|
||||
unsigned long i;
|
||||
#ifdef CONFIG_FEATURE_FANCY_HEAD
|
||||
#if ENABLE_FEATURE_FANCY_HEAD
|
||||
int count_bytes = 0;
|
||||
int header_threshhold = 1;
|
||||
#endif
|
||||
@ -56,7 +56,7 @@ int head_main(int argc, char **argv)
|
||||
int c;
|
||||
int retval = EXIT_SUCCESS;
|
||||
|
||||
#if defined CONFIG_FEATURE_SUSv2 || defined CONFIG_FEATURE_FANCY_HEAD
|
||||
#if defined CONFIG_FEATURE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
|
||||
/* Allow legacy syntax of an initial numeric option without -n. */
|
||||
if ((argc > 1) && (argv[1][0] == '-')
|
||||
/* && (isdigit)(argv[1][1]) */
|
||||
@ -72,7 +72,7 @@ int head_main(int argc, char **argv)
|
||||
/* No size benefit in converting this to bb_getopt_ulflags */
|
||||
while ((opt = getopt(argc, argv, head_opts)) > 0) {
|
||||
switch(opt) {
|
||||
#ifdef CONFIG_FEATURE_FANCY_HEAD
|
||||
#if ENABLE_FEATURE_FANCY_HEAD
|
||||
case 'q':
|
||||
header_threshhold = INT_MAX;
|
||||
break;
|
||||
@ -85,7 +85,9 @@ int head_main(int argc, char **argv)
|
||||
#endif
|
||||
case 'n':
|
||||
p = optarg;
|
||||
#if ENABLE_FEATURE_FANCY_HEAD
|
||||
GET_COUNT:
|
||||
#endif
|
||||
count = bb_xgetularg10(p);
|
||||
break;
|
||||
default:
|
||||
@ -99,7 +101,7 @@ int head_main(int argc, char **argv)
|
||||
}
|
||||
|
||||
fmt = header_fmt_str + 1;
|
||||
#ifdef CONFIG_FEATURE_FANCY_HEAD
|
||||
#if ENABLE_FEATURE_FANCY_HEAD
|
||||
if (argc - optind <= header_threshhold) {
|
||||
header_threshhold = 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user