treewide: add ul_ to parse_range() function name

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

diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 49d506158076a25f9d4bcb559734d635be22792b..4c8b1f09b09ada0fa3f929d89b6fa2af8b9ae4e5 100644 (file)
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -864,7 +864,7 @@ int main(int argc, char **argv)
                        what = ACT_LIST;
                        break;
                case 'n':
-                       if (parse_range(optarg, &lower, &upper, 0))
+                       if (ul_parse_range(optarg, &lower, &upper, 0))
                                errx(EXIT_FAILURE, _("failed to parse --nr <M-N> range"));
                        break;
                case 'o':

diff --git a/include/strutils.h b/include/strutils.h
index f8eb5f7c454647a7778230df0860e873959bbfcb..58cca41c981154b41f4e0c4cfb024af6e2c4e43d 100644 (file)
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -260,7 +260,7 @@ extern int string_to_bitarray(const char *list, char *ary,
 extern int string_to_bitmask(const char *list,
                             unsigned long *mask,
                             long (*name2flag)(const char *, size_t));
-extern int parse_range(const char *str, int *lower, int *upper, int def);
+extern int ul_parse_range(const char *str, int *lower, int *upper, int def);
 
 extern int streq_paths(const char *a, const char *b);
 

diff --git a/lib/strutils.c b/lib/strutils.c
index 4d727585af6658fd497ebc4ffdcad788dd5f8b81..cfa4d262d134209b6a9c5c9a04be4f90d4c6d3e3 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -863,7 +863,7 @@ int string_to_bitmask(const char *list,
  *
  * Returns: 0 on success, <0 on error.
  */
-int parse_range(const char *str, int *lower, int *upper, int def)
+int ul_parse_range(const char *str, int *lower, int *upper, int def)
 {
        char *end = NULL;
 

diff --git a/text-utils/column.c b/text-utils/column.c
index d67251648fc04c9e2efcc9aab459c500b3e64a8b..a929cd8136aabfd46fa5f2395de84d3e354d73c6 100644 (file)
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -482,7 +482,7 @@ static void apply_columnflag_from_list(struct column_control *ctl, const char *l
                }
 
                /* parse range (N-M) */
-               if (strchr(*one, '-') && parse_range(*one, &low, &up, 0) == 0) {
+               if (strchr(*one, '-') && ul_parse_range(*one, &low, &up, 0) == 0) {
                        for (; low <= up; low++) {
                                if (low < 0)
                                        cl = get_last_visible_column(ctl, (low * -1) -1);