LogMessageData: Fix assignment in constructor

The previous code was assigning to the function argument, not
the member variable.  Since our member variable is 'const'
we use a helper function to acheive this.

Test: m test-art-host
Change-Id: I11bf7b04297b7b6c0649a87416a7a6e622e2db43

diff --git a/runtime/base/logging.cc b/runtime/base/logging.cc
index 28352cb..529c391 100644 (file)
--- a/runtime/base/logging.cc
+++ b/runtime/base/logging.cc
@@ -139,13 +139,10 @@ void InitLogging(char* argv[]) {
 class LogMessageData {
  public:
   LogMessageData(const char* file, unsigned int line, LogSeverity severity, int error)
-      : file_(file),
+      : file_(GetFilenameBase(file)),
         line_number_(line),
         severity_(severity),
-        error_(error) {
-    const char* last_slash = strrchr(file, '/');
-    file = (last_slash == nullptr) ? file : last_slash + 1;
-  }
+        error_(error) {}
 
   const char * GetFile() const {
     return file_;
@@ -178,6 +175,11 @@ class LogMessageData {
   const LogSeverity severity_;
   const int error_;
 
+  static const char* GetFilenameBase(const char* file) {
+    const char* last_slash = strrchr(file, '/');
+    return (last_slash == nullptr) ? file : last_slash + 1;
+  }
+
   DISALLOW_COPY_AND_ASSIGN(LogMessageData);
 };