[PATCH v2] scanner: Fix reported executable name to 'wayland-scanner'

[Yong Bakos]

On Jun 6, 2016, at 12:58 PM, Bryce Harrington <bryce at osg.samsung.com> wrote:
> 
> 'wayland-scanner -v' (correctly) reports the program as named
> "wayland-scanner", but 'wayland-scanner -h' was inconsistent, referring
> to it as './scanner'.
> 
> Also refactor this and other references to the program name to use a
> common #define, PROGRAM_NAME.
> 
> Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
> Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

Reviewed-by: Yong Bakos <ybakos at humanoriented.com>
Tested-by: Yong Bakos <ybakos at humanoriented.com>

Cheers,
yong


> ---
> src/scanner.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/src/scanner.c b/src/scanner.c
> index 5f06e8e..d5442c1 100644
> --- a/src/scanner.c
> +++ b/src/scanner.c
> @@ -42,6 +42,8 @@
> #if HAVE_LIBXML
> #include <libxml/parser.h>
> 
> +#define PROGRAM_NAME "wayland-scanner"
> +
> /* Embedded wayland.dtd file, see dtddata.S */
> extern char DTD_DATA_begin;
> extern int DTD_DATA_len;
> @@ -57,8 +59,8 @@ enum side {
> static int
> usage(int ret)
> {
> -	fprintf(stderr, "usage: ./scanner [OPTION] [client-header|server-header|code]"
> -		" [input_file output_file]\n");
> +	fprintf(stderr, "usage: %s [OPTION] [client-header|server-header|code]"
> +		" [input_file output_file]\n", PROGRAM_NAME);
> 	fprintf(stderr, "\n");
> 	fprintf(stderr, "Converts XML protocol descriptions supplied on "
> 			"stdin or input file to client\n"
> @@ -76,7 +78,7 @@ usage(int ret)
> static int
> scanner_version(int ret)
> {
> -	fprintf(stderr, "wayland-scanner %s\n", WAYLAND_VERSION);
> +	fprintf(stderr, "%s %s\n", PROGRAM_NAME, WAYLAND_VERSION);
> 	exit(ret);
> }
> 
> @@ -236,7 +238,7 @@ static void *
> fail_on_null(void *p)
> {
> 	if (p == NULL) {
> -		fprintf(stderr, "wayland-scanner: out of memory\n");
> +		fprintf(stderr, "%s: out of memory\n", PROGRAM_NAME);
> 		exit(EXIT_FAILURE);
> 	}
> 
> @@ -1467,7 +1469,7 @@ emit_header(struct protocol *protocol, enum side side)
> 	const char *s = (side == SERVER) ? "SERVER" : "CLIENT";
> 	char **p, *prev;
> 
> -	printf("/* Generated by wayland-scanner %s */\n\n", WAYLAND_VERSION);
> +	printf("/* Generated by %s %s */\n\n", PROGRAM_NAME, WAYLAND_VERSION);
> 
> 	printf("#ifndef %s_%s_PROTOCOL_H\n"
> 	       "#define %s_%s_PROTOCOL_H\n"
> @@ -1670,7 +1672,7 @@ emit_code(struct protocol *protocol)
> 	struct wl_array types;
> 	char **p, *prev;
> 
> -	printf("/* Generated by wayland-scanner %s */\n\n", WAYLAND_VERSION);
> +	printf("/* Generated by %s %s */\n\n", PROGRAM_NAME, WAYLAND_VERSION);
> 
> 	if (protocol->copyright)
> 		format_text_to_comment(protocol->copyright, true);
> -- 
> 1.9.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel