summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/common-utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'libglusterfs/src/common-utils.c')
-rw-r--r--libglusterfs/src/common-utils.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index a9e74cb895a..cf5b524dc12 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -1581,11 +1581,12 @@ err:
}
int
-gf_string2bytesize_range (const char *str, uint64_t *n, uint64_t max)
+gf_string2bytesize_range (const char *str, uint64_t *n, uint64_t umax)
{
double value = 0.0;
- uint64_t int_value = 0;
+ int64_t int_value = 0;
uint64_t unit = 0;
+ int64_t max = 0;
char *tail = NULL;
int old_errno = 0;
const char *s = NULL;
@@ -1598,6 +1599,8 @@ gf_string2bytesize_range (const char *str, uint64_t *n, uint64_t max)
return -1;
}
+ max = umax & 0x7fffffffffffffffLL;
+
for (s = str; *s != '\0'; s++) {
if (isspace (*s))
continue;
@@ -2114,7 +2117,7 @@ get_nth_word (const char *str, int n)
if (!end)
goto out;
- word_len = abs (end - start);
+ word_len = labs (end - start);
word = GF_CALLOC (1, word_len + 1, gf_common_mt_strdup);
if (!word)