diff options
author | Mike Frysinger <vapier@gentoo.org> | 2013-05-24 18:04:43 +1000 |
---|---|---|
committer | David Gibson <david@gibson.dropbear.id.au> | 2013-05-24 18:20:53 +1000 |
commit | b9e80656f2de441826ed2ff1cd9c5d43b3ae43d3 (patch) | |
tree | d0f093d618038577d98fcd463e4b4e7b639ebc60 | |
parent | 03449b84c8f9aee2bf2f438bec2c2ec4606bea48 (diff) | |
download | dtc-b9e80656f2de441826ed2ff1cd9c5d43b3ae43d3.zip dtc-b9e80656f2de441826ed2ff1cd9c5d43b3ae43d3.tar.gz dtc-b9e80656f2de441826ed2ff1cd9c5d43b3ae43d3.tar.bz2 |
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>
-rw-r--r-- | convert-dtsv0-lexer.l | 2 | ||||
-rw-r--r-- | dtc.c | 6 | ||||
-rw-r--r-- | fdtdump.c | 2 | ||||
-rw-r--r-- | fdtget.c | 6 | ||||
-rw-r--r-- | fdtput.c | 8 | ||||
-rw-r--r-- | util.c | 6 | ||||
-rw-r--r-- | util.h | 18 |
7 files changed, 24 insertions, 24 deletions
diff --git a/convert-dtsv0-lexer.l b/convert-dtsv0-lexer.l index e62d27a..8902648 100644 --- a/convert-dtsv0-lexer.l +++ b/convert-dtsv0-lexer.l @@ -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]); @@ -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 @@ -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); @@ -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[]) 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[]) /* 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; @@ -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[]) 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)) @@ -393,9 +393,9 @@ void util_version(void) exit(0); } -void util_long_usage(const char *errmsg, const char *synopsis, - const char *short_opts, struct option const long_opts[], - const char * const opts_help[]) +void util_usage(const char *errmsg, const char *synopsis, + const char *short_opts, struct option const long_opts[], + const char * const opts_help[]) { FILE *fp = errmsg ? stderr : stdout; const char a_arg[] = "<arg>"; @@ -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,9 +197,9 @@ 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, - const char *short_opts, struct option const long_opts[], - const char * const opts_help[]) __attribute__((noreturn)); +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)); /** * Show usage and exit @@ -209,9 +209,9 @@ 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, \ - usage_long_opts, usage_opts_help) +#define usage(errmsg) \ + util_usage(errmsg, usage_synopsis, usage_short_opts, \ + usage_long_opts, usage_opts_help) /** * Call getopt_long() with standard options @@ -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 */ |