fb32c907fc
libblkid.a from util-linux-2.41 (btrfsprogs-libblkid-static-lib-clash.patch). OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=437
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
Index: btrfs-progs-v6.14/common/parse-utils.c
|
|
===================================================================
|
|
--- btrfs-progs-v6.14.orig/common/parse-utils.c
|
|
+++ btrfs-progs-v6.14/common/parse-utils.c
|
|
@@ -71,7 +71,7 @@ int parse_u64(const char *str, u64 *resu
|
|
* Returned values are u64, value validation and interpretation should be done
|
|
* by the caller.
|
|
*/
|
|
-int parse_range(const char *range, u64 *start, u64 *end)
|
|
+int parse_range_u64(const char *range, u64 *start, u64 *end)
|
|
{
|
|
char *dots;
|
|
char *endptr;
|
|
@@ -134,7 +134,7 @@ int parse_range_u32(const char *range, u
|
|
u64 tmp_start;
|
|
u64 tmp_end;
|
|
|
|
- if (parse_range(range, &tmp_start, &tmp_end))
|
|
+ if (parse_range_u64(range, &tmp_start, &tmp_end))
|
|
return 1;
|
|
|
|
if (range_to_u32(tmp_start, tmp_end, start, end))
|
|
@@ -149,7 +149,7 @@ int parse_range_u32(const char *range, u
|
|
*/
|
|
int parse_range_strict(const char *range, u64 *start, u64 *end)
|
|
{
|
|
- if (parse_range(range, start, end) == 0) {
|
|
+ if (parse_range_u64(range, start, end) == 0) {
|
|
if (*start >= *end) {
|
|
error("range %llu..%llu not allowed", *start, *end);
|
|
return 1;
|
|
Index: btrfs-progs-v6.14/common/parse-utils.h
|
|
===================================================================
|
|
--- btrfs-progs-v6.14.orig/common/parse-utils.h
|
|
+++ btrfs-progs-v6.14/common/parse-utils.h
|
|
@@ -24,7 +24,7 @@ enum btrfs_csum_type parse_csum_type(con
|
|
int parse_u64(const char *str, u64 *result);
|
|
int parse_u64_with_suffix(const char *s, u64 *value_ret);
|
|
int parse_range_u32(const char *range, u32 *start, u32 *end);
|
|
-int parse_range(const char *range, u64 *start, u64 *end);
|
|
+int parse_range_u64(const char *range, u64 *start, u64 *end);
|
|
int parse_range_strict(const char *range, u64 *start, u64 *end);
|
|
int parse_bg_profile(const char *profile, u64 *flags);
|
|
int parse_compress_type(const char *type);
|