diff options
| author | unknown <monty@mysql.com> | 2004-05-12 02:38:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-12 02:38:57 +0300 |
| commit | 47890151b47af55431a808e59af738a35d1a0bb7 (patch) | |
| tree | 02e8baaa5fa67d84f1517dd0fe43ee84dd6ef34f /strings/my_strtoll10.c | |
| parent | cd8f9ed2a294a80eb41f026eaab176e51209aa4c (diff) | |
| download | mariadb-git-47890151b47af55431a808e59af738a35d1a0bb7.tar.gz | |
Portability fixes
scripts/mysql_install_db.sh:
Portability fix (! is not portable)
sql/item_func.cc:
Use my_strtoll10() instead of strtoull()
sql/repl_failsafe.cc:
Use my_strtoll10() instead of strtoull()
sql/sql_analyse.cc:
Use my_strtoll10() instead of strtoull()
sql/sql_yacc.yy:
Use my_strtoll10() instead of strtoull()
strings/my_strtoll10.c:
Fix compiler warnings
Diffstat (limited to 'strings/my_strtoll10.c')
| -rw-r--r-- | strings/my_strtoll10.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c index 6319fbb4d9f..349350c6c7a 100644 --- a/strings/my_strtoll10.c +++ b/strings/my_strtoll10.c @@ -196,15 +196,15 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error) goto overflow; /* Check that we didn't get an overflow with the last digit */ - if (i > cutoff || i == cutoff && (j > cutoff2 || j == cutoff2 && - k > cutoff3)) + if (i > cutoff || (i == cutoff && ((j > cutoff2 || j == cutoff2) && + k > cutoff3))) goto overflow; li=i*LFACTOR2+ (ulonglong) j*100 + k; return (longlong) li; overflow: /* *endptr is set here */ *error= MY_ERRNO_ERANGE; - return negative ? LONGLONG_MIN : ULONGLONG_MAX; + return negative ? LONGLONG_MIN : (longlong) ULONGLONG_MAX; end_i: *endptr= (char*) s; |