Browse Source

util: drop "long" from usage helpers

Now that all utils have converted to the new usage framework, we can
rename to just plain "usage()" and avoid naming conflicts.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
Mike Frysinger 12 years ago committed by David Gibson
parent
commit
b9e80656f2
  1. 2
      convert-dtsv0-lexer.l
  2. 6
      dtc.c
  3. 2
      fdtdump.c
  4. 6
      fdtget.c
  5. 8
      fdtput.c
  6. 2
      util.c
  7. 12
      util.h

2
convert-dtsv0-lexer.l

@ -239,7 +239,7 @@ int main(int argc, char *argv[]) @@ -239,7 +239,7 @@ int main(int argc, char *argv[])
}
}
if (argc < 2)
long_usage("missing filename");
usage("missing filename");

for (i = 1; i < argc; i++) {
fprintf(stderr, "Converting %s from dts v0 to dts v1\n", argv[i]);

6
dtc.c

@ -186,14 +186,14 @@ int main(int argc, char *argv[]) @@ -186,14 +186,14 @@ int main(int argc, char *argv[])
break;

case 'h':
long_usage(NULL);
usage(NULL);
default:
long_usage("unknown option");
usage("unknown option");
}
}

if (argc > (optind+1))
long_usage("missing files");
usage("missing files");
else if (argc < (optind+1))
arg = "-";
else

2
fdtdump.c

@ -149,7 +149,7 @@ int main(int argc, char *argv[]) @@ -149,7 +149,7 @@ int main(int argc, char *argv[])
}
}
if (optind != argc - 1)
long_usage("missing input filename");
usage("missing input filename");
file = argv[optind];

buf = utilfdt_read_len(file, &len);

6
fdtget.c

@ -319,7 +319,7 @@ int main(int argc, char *argv[]) @@ -319,7 +319,7 @@ int main(int argc, char *argv[])
case 't':
if (utilfdt_decode_type(optarg, &disp.type,
&disp.size))
long_usage("invalid type string");
usage("invalid type string");
break;

case 'p':
@ -341,7 +341,7 @@ int main(int argc, char *argv[]) @@ -341,7 +341,7 @@ int main(int argc, char *argv[])
if (optind < argc)
filename = argv[optind++];
if (!filename)
long_usage("missing filename");
usage("missing filename");

argv += optind;
argc -= optind;
@ -352,7 +352,7 @@ int main(int argc, char *argv[]) @@ -352,7 +352,7 @@ int main(int argc, char *argv[])

/* Check for node, property arguments */
if (args_per_step == 2 && (argc % 2))
long_usage("must have an even number of arguments");
usage("must have an even number of arguments");

if (do_fdtget(&disp, filename, argv, argc, args_per_step))
return 1;

8
fdtput.c

@ -327,7 +327,7 @@ int main(int argc, char *argv[]) @@ -327,7 +327,7 @@ int main(int argc, char *argv[])
case 't':
if (utilfdt_decode_type(optarg, &disp.type,
&disp.size))
long_usage("Invalid type string");
usage("Invalid type string");
break;

case 'v':
@ -339,16 +339,16 @@ int main(int argc, char *argv[]) @@ -339,16 +339,16 @@ int main(int argc, char *argv[])
if (optind < argc)
filename = argv[optind++];
if (!filename)
long_usage("missing filename");
usage("missing filename");

argv += optind;
argc -= optind;

if (disp.oper == OPER_WRITE_PROP) {
if (argc < 1)
long_usage("missing node");
usage("missing node");
if (argc < 2)
long_usage("missing property");
usage("missing property");
}

if (do_fdtput(&disp, filename, argv, argc))

2
util.c

@ -393,7 +393,7 @@ void util_version(void) @@ -393,7 +393,7 @@ void util_version(void)
exit(0);
}

void util_long_usage(const char *errmsg, const char *synopsis,
void util_usage(const char *errmsg, const char *synopsis,
const char *short_opts, struct option const long_opts[],
const char * const opts_help[])
{

12
util.h

@ -189,7 +189,7 @@ void util_version(void) __attribute__((noreturn)); @@ -189,7 +189,7 @@ void util_version(void) __attribute__((noreturn));
* Show usage and exit
*
* This helps standardize the output of various utils. You most likely want
* to use the long_usage() helper below rather than call this.
* to use the usage() helper below rather than call this.
*
* @param errmsg If non-NULL, an error message to display
* @param synopsis The initial example usage text (and possible examples)
@ -197,7 +197,7 @@ void util_version(void) __attribute__((noreturn)); @@ -197,7 +197,7 @@ void util_version(void) __attribute__((noreturn));
* @param long_opts The structure of long options
* @param opts_help An array of help strings (should align with long_opts)
*/
void util_long_usage(const char *errmsg, const char *synopsis,
void util_usage(const char *errmsg, const char *synopsis,
const char *short_opts, struct option const long_opts[],
const char * const opts_help[]) __attribute__((noreturn));

@ -209,8 +209,8 @@ void util_long_usage(const char *errmsg, const char *synopsis, @@ -209,8 +209,8 @@ void util_long_usage(const char *errmsg, const char *synopsis,
*
* @param errmsg If non-NULL, an error message to display
*/
#define long_usage(errmsg) \
util_long_usage(errmsg, usage_synopsis, usage_short_opts, \
#define usage(errmsg) \
util_usage(errmsg, usage_synopsis, usage_short_opts, \
usage_long_opts, usage_opts_help)

/**
@ -241,8 +241,8 @@ void util_long_usage(const char *errmsg, const char *synopsis, @@ -241,8 +241,8 @@ void util_long_usage(const char *errmsg, const char *synopsis,

/* Helper for getopt case statements */
#define case_USAGE_COMMON_FLAGS \
case 'h': long_usage(NULL); \
case 'h': usage(NULL); \
case 'V': util_version(); \
case '?': long_usage("unknown option");
case '?': usage("unknown option");

#endif /* _UTIL_H */

Loading…
Cancel
Save