treewide: add ul_ to parse_switch() function name

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/strutils.h b/include/strutils.h
index 7aaca5696f44b9dc2a5701ba125cc03bb4264a60..54f0e14dab895ab5b639e9cbbc56278f56595719 100644 (file)
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -68,7 +68,7 @@ extern int isxdigit_strend(const char *str, const char **end);
 #define isxdigit_string(_s)    isxdigit_strend(_s, NULL)
 
 
-extern int parse_switch(const char *arg, const char *errmesg, ...);
+extern int ul_parse_switch(const char *arg, const char *errmesg, ...);
 
 #ifndef HAVE_MEMPCPY
 extern void *mempcpy(void *restrict dest, const void *restrict src, size_t n);

diff --git a/lib/strutils.c b/lib/strutils.c
index 56a53fdbb01a884628522d91add486c94a1e1bb0..330489c419df7711bbf9c9c5a431d74456bd7b30 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -247,9 +247,9 @@ int isxdigit_strend(const char *str, const char **end)
 }
 
 /*
- *  parse_switch(argv[i], "on", "off",  "yes", "no",  NULL);
+ *  ul_parse_switch(argv[i], "on", "off",  "yes", "no",  NULL);
  */
-int parse_switch(const char *arg, const char *errmesg, ...)
+int ul_parse_switch(const char *arg, const char *errmesg, ...)
 {
        const char *a, *b;
        va_list ap;

diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index 310d6c3dfad09b466ed6b85acf52904609ef0f46..5456424755156edab8f95321ccf7700e64bfc21f 100644 (file)
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -207,7 +207,7 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv)
                switch (c) {
                case 'a':
                        ctl->a_option = 1;
-                       ctl->a_arg = parse_switch(optarg, _("argument error"),
+                       ctl->a_arg = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off",  "1", "0",  NULL);
                        break;
                case 'c':
@@ -229,7 +229,7 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv)
                        break;
                case 'i':
                        ctl->i_option = 1;
-                       ctl->i_arg = parse_switch(optarg, _("argument error"),
+                       ctl->i_arg = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off",  "1", "0",  NULL);
                        break;
                case 'm':

diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index eafab72f3df614f9fe45f815466dd6106a83354c..1f09df601e72d96ebc5777158912f9d49b1c7391 100644 (file)
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -818,7 +818,7 @@ int main(int argc, char **argv)
                case OPT_DIO:
                        use_dio = set_dio = 1;
                        if (optarg)
-                               use_dio = parse_switch(optarg, _("argument error"), "on", "off", NULL);
+                               use_dio = ul_parse_switch(optarg, _("argument error"), "on", "off", NULL);
                        if (use_dio)
                                lo_flags |= LO_FLAGS_DIRECT_IO;
                        break;

diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 95a21b39eeecbebec1b4b89543fc1916e964f40c..9293ad5814b4e25502abf7d0f1da4155a876bb0f 100644 (file)
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -189,24 +189,24 @@ int main(int argc, char **argv)
                        break;
                case 'a':
                        cmds->op = LPABORT;
-                       cmds->val = parse_switch(optarg, _("argument error"), "on", "off", NULL);
+                       cmds->val = ul_parse_switch(optarg, _("argument error"), "on", "off", NULL);
                        cmds->next = xmalloc(sizeof(struct command));
                        cmds = cmds->next;
                        cmds->next = NULL;
                        break;
                case 'q':
-                       show_irq = parse_switch(optarg, _("argument error"), "on", "off", NULL);
+                       show_irq = ul_parse_switch(optarg, _("argument error"), "on", "off", NULL);
                        break;
                case 'o':
                        cmds->op = LPABORTOPEN;
-                       cmds->val = parse_switch(optarg, _("argument error"), "on", "off", NULL);
+                       cmds->val = ul_parse_switch(optarg, _("argument error"), "on", "off", NULL);
                        cmds->next = xmalloc(sizeof(struct command));
                        cmds = cmds->next;
                        cmds->next = NULL;
                        break;
                case 'C':
                        cmds->op = LPCAREFUL;
-                       cmds->val = parse_switch(optarg, _("argument error"), "on", "off", NULL);
+                       cmds->val = ul_parse_switch(optarg, _("argument error"), "on", "off", NULL);
                        cmds->next = xmalloc(sizeof(struct command));
                        cmds = cmds->next;
                        cmds->next = NULL;

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 801095c8751607d042c8be178a2ceb58905cc5f5..1941d0ca7fd937a21628243a9f957b125342b11c 100644 (file)
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -559,22 +559,22 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av)
                        break;
                case OPT_CURSOR:
                        ctl->opt_cursor = set_opt_flag(ctl->opt_cursor);
-                       ctl->opt_cu_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_cu_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_REPEAT:
                        ctl->opt_repeat = set_opt_flag(ctl->opt_repeat);
-                       ctl->opt_rep_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_rep_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_APPCURSORKEYS:
                        ctl->opt_appcursorkeys = set_opt_flag(ctl->opt_appcursorkeys);
-                       ctl->opt_appck_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_appck_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_LINEWRAP:
                        ctl->opt_linewrap = set_opt_flag(ctl->opt_linewrap);
-                       ctl->opt_li_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_li_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_DEFAULT:
@@ -598,32 +598,32 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av)
                        break;
                case OPT_INVERSESCREEN:
                        ctl->opt_inversescreen = set_opt_flag(ctl->opt_inversescreen);
-                       ctl->opt_invsc_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_invsc_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_BOLD:
                        ctl->opt_bold = set_opt_flag(ctl->opt_bold);
-                       ctl->opt_bo_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_bo_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_HALF_BRIGHT:
                        ctl->opt_halfbright = set_opt_flag(ctl->opt_halfbright);
-                       ctl->opt_hb_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_hb_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_BLINK:
                        ctl->opt_blink = set_opt_flag(ctl->opt_blink);
-                       ctl->opt_bl_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_bl_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_REVERSE:
                        ctl->opt_reverse = set_opt_flag(ctl->opt_reverse);
-                       ctl->opt_re_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_re_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_UNDERLINE:
                        ctl->opt_underline = set_opt_flag(ctl->opt_underline);
-                       ctl->opt_un_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_un_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_STORE:
@@ -632,7 +632,7 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av)
                case OPT_CLEAR:
                        ctl->opt_clear = set_opt_flag(ctl->opt_clear);
                        if (optarg)
-                               ctl->opt_cl_all = parse_switch(optarg, _("argument error"),
+                               ctl->opt_cl_all = ul_parse_switch(optarg, _("argument error"),
                                                "all", "rest", NULL);
                        else
                                ctl->opt_cl_all = 1;
@@ -667,7 +667,7 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av)
                        break;
                case OPT_MSG:
                        ctl->opt_msg = set_opt_flag(ctl->opt_msg);
-                       ctl->opt_msg_on = parse_switch(optarg, _("argument error"),
+                       ctl->opt_msg_on = ul_parse_switch(optarg, _("argument error"),
                                                "on", "off", NULL);
                        break;
                case OPT_MSGLEVEL: