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 | b957f99d572399303d8c5a181199a1d4df72490e (patch) | |
tree | 3a8593a3200ad58c1d0d7f673a7dd5ed12c87424 | |
parent | 9786946731da30f0ad849e2ecaa779eb53777130 (diff) | |
download | bcm5719-llvm-b957f99d572399303d8c5a181199a1d4df72490e.tar.gz bcm5719-llvm-b957f99d572399303d8c5a181199a1d4df72490e.zip |
[sanitizer] Use const char* in internal_simple_strtoll
llvm-svn: 334900
-rw-r--r-- | compiler-rt/lib/asan/asan_report.cc | 2 | ||||
-rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.h | 4 | ||||
-rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_libc.cc | 2 | ||||
-rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_libc.h | 2 | ||||
-rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc | 2 | ||||
-rw-r--r-- | compiler-rt/lib/xray/xray_utils.cc | 2 | ||||
-rw-r--r-- | compiler-rt/lib/xray/xray_x86_64.cc | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/compiler-rt/lib/asan/asan_report.cc b/compiler-rt/lib/asan/asan_report.cc index b1762c6974e..439712350e4 100644 --- a/compiler-rt/lib/asan/asan_report.cc +++ b/compiler-rt/lib/asan/asan_report.cc @@ -84,7 +84,7 @@ static void PrintZoneForPointer(uptr ptr, uptr zone_ptr, bool ParseFrameDescription(const char *frame_descr, InternalMmapVector<StackVarDescr> *vars) { CHECK(frame_descr); - char *p; + const char *p; // This string is created by the compiler and has the following form: // "n alloc_1 alloc_2 ... alloc_n" // where alloc_i looks like "offset size len ObjectName" diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.h b/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.h index f649f5bffea..705bfe23b30 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.h +++ b/compiler-rt/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/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc b/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc index c38a8407a83..4b462bfe972 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc +++ b/compiler-rt/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/compiler-rt/lib/sanitizer_common/sanitizer_libc.h b/compiler-rt/lib/sanitizer_common/sanitizer_libc.h index a5b3e47bfbd..7ed4e28a569 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_libc.h +++ b/compiler-rt/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/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc index d309dac8b72..73c2141c6b3 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/compiler-rt/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; diff --git a/compiler-rt/lib/xray/xray_utils.cc b/compiler-rt/lib/xray/xray_utils.cc index a27ac945113..68f4e8c1094 100644 --- a/compiler-rt/lib/xray/xray_utils.cc +++ b/compiler-rt/lib/xray/xray_utils.cc @@ -82,7 +82,7 @@ bool readValueFromFile(const char *Filename, if (!Success) return false; close(Fd); - char *End = nullptr; + const char *End = nullptr; long long Tmp = internal_simple_strtoll(Line, &End, 10); bool Result = false; if (Line[0] != '\0' && (*End == '\n' || *End == '\0')) { diff --git a/compiler-rt/lib/xray/xray_x86_64.cc b/compiler-rt/lib/xray/xray_x86_64.cc index 2021632f083..246d1448322 100644 --- a/compiler-rt/lib/xray/xray_x86_64.cc +++ b/compiler-rt/lib/xray/xray_x86_64.cc @@ -57,7 +57,7 @@ static bool readValueFromFile(const char *Filename, close(Fd); if (!Success) return false; - char *End = nullptr; + const char *End = nullptr; long long Tmp = internal_simple_strtoll(Line, &End, 10); bool Result = false; if (Line[0] != '\0' && (*End == '\n' || *End == '\0')) { |