diff options
author | Dean Michael Berris <dberris@google.com> | 2018-06-08 07:48:03 +0000 |
---|---|---|
committer | Dean Michael Berris <dberris@google.com> | 2018-06-08 07:48:03 +0000 |
commit | ab9e501d669f862d697cf0a7092ba665ea50af4d (patch) | |
tree | e76b020204753a4f00569b5c909f18985a00e289 /lib | |
parent | 68624e45b595753f69201df2a84dee466b05d968 (diff) |
[XRay][compiler-rt] Cleanup some internal XRay utilities
This change uses 'const' for the retryingWriteAll(...) API and removes
unnecessary 'static' local variables in getting the temporary filename.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@334267 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/xray/xray_utils.cc | 12 | ||||
-rw-r--r-- | lib/xray/xray_utils.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/xray/xray_utils.cc b/lib/xray/xray_utils.cc index 2fadad87b..a27ac9451 100644 --- a/lib/xray/xray_utils.cc +++ b/lib/xray/xray_utils.cc @@ -15,11 +15,11 @@ #include "sanitizer_common/sanitizer_common.h" #include "xray_defs.h" #include "xray_flags.h" -#include <stdlib.h> #include <cstdio> #include <errno.h> #include <fcntl.h> #include <iterator> +#include <stdlib.h> #include <sys/types.h> #include <tuple> #include <unistd.h> @@ -31,7 +31,7 @@ void printToStdErr(const char *Buffer) XRAY_NEVER_INSTRUMENT { fprintf(stderr, "%s", Buffer); } -void retryingWriteAll(int Fd, char *Begin, char *End) XRAY_NEVER_INSTRUMENT { +void retryingWriteAll(int Fd, const char *Begin, const char *End) XRAY_NEVER_INSTRUMENT { if (Begin == End) return; auto TotalBytes = std::distance(Begin, End); @@ -94,10 +94,10 @@ bool readValueFromFile(const char *Filename, int getLogFD() XRAY_NEVER_INSTRUMENT { // Open a temporary file once for the log. - static char TmpFilename[256] = {}; - static char TmpWildcardPattern[] = "XXXXXX"; - auto Argv = GetArgv(); - const char *Progname = Argv[0] == nullptr ? "(unknown)" : Argv[0]; + char TmpFilename[256] = {}; + char TmpWildcardPattern[] = "XXXXXX"; + auto **Argv = GetArgv(); + const char *Progname = !Argv ? "(unknown)" : Argv[0]; const char *LastSlash = internal_strrchr(Progname, '/'); if (LastSlash != nullptr) diff --git a/lib/xray/xray_utils.h b/lib/xray/xray_utils.h index 1ecc74a2d..a06a59491 100644 --- a/lib/xray/xray_utils.h +++ b/lib/xray/xray_utils.h @@ -24,7 +24,7 @@ namespace __xray { void printToStdErr(const char *Buffer); // EINTR-safe write routine, provided a file descriptor and a character range. -void retryingWriteAll(int Fd, char *Begin, char *End); +void retryingWriteAll(int Fd, const char *Begin, const char *End); // Reads a long long value from a provided file. bool readValueFromFile(const char *Filename, long long *Value); |