On 01.12.20 13:31, [ext] Silvano Cirujano Cuesta wrote: > Signed-off-by: Silvano Cirujano Cuesta <[email protected]> > --- > tools/bg_setenv.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/tools/bg_setenv.c b/tools/bg_setenv.c > index 24b4067..3d7329f 100644 > --- a/tools/bg_setenv.c > +++ b/tools/bg_setenv.c > @@ -23,29 +23,29 @@ static char doc[] = > "bg_setenv/bg_printenv - Environment tool for the EFI Boot Guard"; > > static struct argp_option options_setenv[] = { > - {"kernel", 'k', "KERNEL", 0, "Set kernel to load"}, > - {"args", 'a', "KERNEL_ARGS", 0, "Set kernel arguments"}, > - {"part", 'p', "ENV_PART", 0, "Set environment partition to update. " > + {"kernel", 'k', "KERNEL", 0, "Set kernel to load"}, > + {"args", 'a', "KERNEL_ARGS", 0, "Set kernel arguments"}, > + {"part", 'p', "ENV_PART", 0, "Set environment partition to update. " > "If no partition is specified, the one " > "with the smallest revision value " > "above zero is updated."}, > - {"revision", 'r', "REVISION", 0, "Set revision value"}, > - {"ustate", 's', "USTATE", 0, "Set update status for environment"}, > - {"filepath", 'f', "ENVFILE_DIR", 0, "Output environment to file. Expects > " > + {"revision", 'r', "REVISION", 0, "Set revision value"}, > + {"ustate", 's', "USTATE", 0, "Set update status for environment"}, > + {"filepath", 'f', "ENVFILE_DIR", 0, "Output environment to file. > Expects " > "an output path where the file name " > "is automatically appended."}, > - {"watchdog", 'w', "WATCHDOG_TIMEOUT", 0, "Watchdog timeout in seconds"}, > - {"confirm", 'c', 0, 0, "Confirm working environment"}, > - {"update", 'u', 0, 0, "Automatically update oldest revision"}, > - {"verbose", 'v', 0, 0, "Be verbose"}, > - {"uservar", 'x', "KEY=VAL", 0, "Set user-defined string variable. For " > + {"watchdog", 'w', "WATCHDOG_TIMEOUT", 0, "Watchdog timeout in seconds"}, > + {"confirm", 'c', 0, 0, "Confirm working environment"}, > + {"update", 'u', 0, 0, "Automatically update oldest revision"}, > + {"verbose", 'v', 0, 0, "Be verbose"}, > + {"uservar", 'x', "KEY=VAL", 0, "Set user-defined string variable. For " > "setting multiple variables, use this " > "option multiple times."}, > - {"in_progress", 'i', "IN_PROGRESS", 0, "Set in_progress variable to " > + {"in_progress", 'i', "IN_PROGRESS", 0, "Set in_progress variable to " > "simulate a running update " > "process."}, > - {"version", 'V', 0, 0, "Print version"}, > - {0}}; > + {"version", 'V', 0, 0, "Print version"}, > + {0}}; > > static struct argp_option options_printenv[] = { > {"verbose", 'v', 0, 0, "Be verbose"}, > @@ -134,7 +134,7 @@ static void journal_process_action(BGENV *env, struct > env_action *action) > t = strtol(arg, &tmp, 10); > if ((errno == ERANGE && (t == LONG_MAX || > t == LONG_MIN)) || > - (errno != 0 && t == 0) || (tmp == arg)) { > + (errno != 0 && t == 0) || (tmp == arg)) > {
That was almost correctly indented, but now it's misleading. Dropped that hunk while merging, will fix up separately on top (there are more inconsistencies in this file). > fprintf(stderr, "Invalid value for ustate: %s", > (char *)action->data); > return; > Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/efibootguard-dev/73b92fc8-1d69-cc7e-76cb-4038ba8537d4%40siemens.com.
