Skip to content

Commit 5e1c034

Browse files
committed
btrfs-progs: rename parse_range to avoid clash with libblkid 2.41
Add local patch from openSUSE that fixes symbol clash of parse_range with util-linux-2.41, in libblkid.a in particular. Author: Stanislav Brabec <sbrabec@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 44c2607 commit 5e1c034

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

common/parse-utils.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int parse_u64(const char *str, u64 *result)
7272
* Returned values are u64, value validation and interpretation should be done
7373
* by the caller.
7474
*/
75-
int parse_range(const char *range, u64 *start, u64 *end)
75+
int parse_range_u64(const char *range, u64 *start, u64 *end)
7676
{
7777
char *dots;
7878
char *endptr;
@@ -135,7 +135,7 @@ int parse_range_u32(const char *range, u32 *start, u32 *end)
135135
u64 tmp_start;
136136
u64 tmp_end;
137137

138-
if (parse_range(range, &tmp_start, &tmp_end))
138+
if (parse_range_u64(range, &tmp_start, &tmp_end))
139139
return 1;
140140

141141
if (range_to_u32(tmp_start, tmp_end, start, end))
@@ -150,7 +150,7 @@ int parse_range_u32(const char *range, u32 *start, u32 *end)
150150
*/
151151
int parse_range_strict(const char *range, u64 *start, u64 *end)
152152
{
153-
if (parse_range(range, start, end) == 0) {
153+
if (parse_range_u64(range, start, end) == 0) {
154154
if (*start >= *end) {
155155
error("range %llu..%llu not allowed", *start, *end);
156156
return 1;

common/parse-utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ enum btrfs_csum_type parse_csum_type(const char *s);
2424
int parse_u64(const char *str, u64 *result);
2525
int parse_u64_with_suffix(const char *s, u64 *value_ret);
2626
int parse_range_u32(const char *range, u32 *start, u32 *end);
27-
int parse_range(const char *range, u64 *start, u64 *end);
27+
int parse_range_u64(const char *range, u64 *start, u64 *end);
2828
int parse_range_strict(const char *range, u64 *start, u64 *end);
2929
int parse_bg_profile(const char *profile, u64 *flags);
3030
int parse_compress_type(const char *type);

0 commit comments

Comments
 (0)