diff options
author | Vitaly Buka <vitalybuka@google.com> | 2018-06-17 08:41:45 +0000 |
---|---|---|
committer | Vitaly Buka <vitalybuka@google.com> | 2018-06-17 08:41:45 +0000 |
commit | 05ea4315fffdc8df19a563df8de318b6d40cbba8 (patch) | |
tree | 3e9c8b6e69946554f69dc11b84da54b9ae3f0d2a /lib/sanitizer_common | |
parent | 3756e8110e6f7d8e1e8a47a048afe02fb3a09999 (diff) |
[sanitizer] Use const char* in internal_simple_strtoll
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@334900 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common')
-rw-r--r-- | lib/sanitizer_common/sanitizer_flag_parser.h | 4 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_libc.cc | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_libc.h | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_linux_libcdep.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/sanitizer_common/sanitizer_flag_parser.h b/lib/sanitizer_common/sanitizer_flag_parser.h index f649f5bff..705bfe23b 100644 --- a/lib/sanitizer_common/sanitizer_flag_parser.h +++ b/lib/sanitizer_common/sanitizer_flag_parser.h @@ -81,7 +81,7 @@ inline bool FlagHandler<const char *>::Parse(const char *value) { template <> inline bool FlagHandler<int>::Parse(const char *value) { - char *value_end; + const char *value_end; *t_ = internal_simple_strtoll(value, &value_end, 10); bool ok = *value_end == 0; if (!ok) Printf("ERROR: Invalid value for int option: '%s'\n", value); @@ -90,7 +90,7 @@ inline bool FlagHandler<int>::Parse(const char *value) { template <> inline bool FlagHandler<uptr>::Parse(const char *value) { - char *value_end; + const char *value_end; *t_ = internal_simple_strtoll(value, &value_end, 10); bool ok = *value_end == 0; if (!ok) Printf("ERROR: Invalid value for uptr option: '%s'\n", value); diff --git a/lib/sanitizer_common/sanitizer_libc.cc b/lib/sanitizer_common/sanitizer_libc.cc index c38a8407a..4b462bfe9 100644 --- a/lib/sanitizer_common/sanitizer_libc.cc +++ b/lib/sanitizer_common/sanitizer_libc.cc @@ -215,7 +215,7 @@ char *internal_strstr(const char *haystack, const char *needle) { return nullptr; } -s64 internal_simple_strtoll(const char *nptr, char **endptr, int base) { +s64 internal_simple_strtoll(const char *nptr, const char **endptr, int base) { CHECK_EQ(base, 10); while (IsSpace(*nptr)) nptr++; int sgn = 1; diff --git a/lib/sanitizer_common/sanitizer_libc.h b/lib/sanitizer_common/sanitizer_libc.h index a5b3e47bf..7ed4e28a5 100644 --- a/lib/sanitizer_common/sanitizer_libc.h +++ b/lib/sanitizer_common/sanitizer_libc.h @@ -49,7 +49,7 @@ uptr internal_strnlen(const char *s, uptr maxlen); char *internal_strrchr(const char *s, int c); char *internal_strstr(const char *haystack, const char *needle); // Works only for base=10 and doesn't set errno. -s64 internal_simple_strtoll(const char *nptr, char **endptr, int base); +s64 internal_simple_strtoll(const char *nptr, const char **endptr, int base); int internal_snprintf(char *buffer, uptr length, const char *format, ...); // Return true if all bytes in [mem, mem+size) are zero. diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index d309dac8b..73c2141c6 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -236,7 +236,7 @@ uptr ThreadDescriptorSize() { char buf[64]; uptr len = confstr(_CS_GNU_LIBC_VERSION, buf, sizeof(buf)); if (len < sizeof(buf) && internal_strncmp(buf, "glibc 2.", 8) == 0) { - char *end; + const char *end; int minor = internal_simple_strtoll(buf + 8, &end, 10); if (end != buf + 8 && (*end == '\0' || *end == '.' || *end == '-')) { int patch = 0; |