On 12/03/2026 3:51 pm, Juergen Gross wrote:
> diff --git a/tools/xs-clients/xenstore_client.c
> b/tools/xs-clients/xenstore_client.c
> index a104cf6487..1794451d43 100644
> --- a/tools/xs-clients/xenstore_client.c
> +++ b/tools/xs-clients/xenstore_client.c
> @@ -214,37 +214,37 @@ output_raw(const char *data, int len)
> }
>
> static void
> -usage(enum mode mode, int incl_mode, const char *progname)
> +usage(int eval, enum mode mode, int incl_mode, const char *progname)
> {
> const char *mstr = NULL;
>
> switch (mode) {
> case MODE_unknown:
> - errx(1, "Usage: %s <mode> [-h] [...]", progname);
> + errx(eval, "Usage: %s <mode> [-h] [...]", progname);
> case MODE_read:
> mstr = incl_mode ? "read " : "";
> - errx(1, "Usage: %s %s[-h] [-p] [-R] key [...]", progname, mstr);
> + errx(eval, "Usage: %s %s[-h] [-p] [-R] key [...]", progname, mstr);
> case MODE_write:
> mstr = incl_mode ? "write " : "";
> - errx(1, "Usage: %s %s[-h] [-R] key value [...]", progname, mstr);
> + errx(eval, "Usage: %s %s[-h] [-R] key value [...]", progname, mstr);
> case MODE_rm:
> mstr = incl_mode ? "rm " : "";
> - errx(1, "Usage: %s %s[-h] [-t] key [...]", progname, mstr);
> + errx(eval, "Usage: %s %s[-h] [-t] key [...]", progname, mstr);
> case MODE_exists:
> mstr = incl_mode ? "exists " : "";
> /* fallthrough */
> case MODE_list:
> mstr = mstr ? : incl_mode ? "list " : "";
> - errx(1, "Usage: %s %s[-h] [-p] key [...]", progname, mstr);
> + errx(eval, "Usage: %s %s[-h] [-p] key [...]", progname, mstr);
> case MODE_ls:
> mstr = mstr ? : incl_mode ? "ls " : "";
> - errx(1, "Usage: %s %s[-h] [-f] [-p] [path]", progname, mstr);
> + errx(eval, "Usage: %s %s[-h] [-f] [-p] [path]", progname, mstr);
> case MODE_chmod:
> mstr = incl_mode ? "chmod " : "";
> - errx(1, "Usage: %s %s[-h] [-u] [-r] key <mode [modes...]>", progname,
> mstr);
> + errx(eval, "Usage: %s %s[-h] [-u] [-r] key <mode [modes...]>",
> progname, mstr);
> case MODE_watch:
> mstr = incl_mode ? "watch " : "";
> - errx(1, "Usage: %s %s[-h] [-n NR] key", progname, mstr);
> + errx(eval, "Usage: %s %s[-h] [-n NR] key", progname, mstr);
> }
> }
I'd not even spotted this, but I agree it wants fixing. Could I
possibly talk you into naming the parameter err_val, seeing as eval
commonly means something very different.
~Andrew
