[PATCH v2 2/5] scalar-[un]register: clearly indicate source of error
flat view
STALE1511d
From: Victoria Dye via GitGitGadget <hidden>
Date: 2022-08-16 23:58:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 3 in this series.
Revisions (3)
- v1 [diff vs current]
- v2 current
- v3 [diff vs current]
From: Victoria Dye <redacted> When a step in 'register_dir()' or 'unregister_dir()' fails, indicate which step failed with an error message, rather than silently assigning a nonzero return code. Signed-off-by: Victoria Dye <redacted> --- contrib/scalar/scalar.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c
index e888fa5408e..6025cd71604 100644
--- a/contrib/scalar/scalar.c
+++ b/contrib/scalar/scalar.c@@ -238,15 +238,16 @@ static int add_or_remove_enlistment(int add) static int register_dir(void) { - int res = add_or_remove_enlistment(1); + if (add_or_remove_enlistment(1)) + return error(_("could not add enlistment")); - if (!res) - res = set_recommended_config(0); + if (set_recommended_config(0)) + return error(_("could not set recommended config")); - if (!res) - res = toggle_maintenance(1); + if (toggle_maintenance(1)) + return error(_("could not turn on maintenance")); - return res; + return 0; } static int unregister_dir(void)
@@ -254,10 +255,10 @@ static int unregister_dir(void) int res = 0; if (toggle_maintenance(0)) - res = -1; + res = error(_("could not turn off maintenance")); if (add_or_remove_enlistment(0)) - res = -1; + res = error(_("could not remove enlistment")); return res; }
--
gitgitgadget