commit 955724179c6c739524f610023287f56b24dc31de
author Elliott Hughes <enh@google.com> Tue Dec 13 18:14:20 2011 -0800
committer Elliott Hughes <enh@google.com> Tue Dec 13 18:14:20 2011 -0800
tree 64f751693e72173ae0d044d8c54989b01f1195af
parent b87f73ea7524f6eb9da6da1af931a3d3fbb833ff

Don't default-construct std::strings and then assign them.

Change-Id: I8c994d1e6a8d2ebe52eaa4f0132e0deb2ecfa5f3

src/file_test.cc

diff --git a/src/file_test.cc b/src/file_test.cc
index 99e4b41..2c91ab6 100644
--- a/src/file_test.cc
+++ b/src/file_test.cc
@@ -11,7 +11,7 @@
 class FileTest : public CommonTest {};
 
 TEST_F(FileTest, Read) {
-  std::string filename = GetLibCoreDexFileName();
+  std::string filename(GetLibCoreDexFileName());
   UniquePtr<File> file(OS::OpenFile(filename.c_str(), false));
   ASSERT_TRUE(file.get() != NULL);
   EXPECT_STREQ(filename.c_str(), file->name());
@@ -25,7 +25,7 @@
 
 
 TEST_F(FileTest, FileLength) {
-  std::string filename = GetLibCoreDexFileName();
+  std::string filename(GetLibCoreDexFileName());
   UniquePtr<File> file(OS::OpenFile(filename.c_str(), false));
   ASSERT_TRUE(file.get() != NULL);
   EXPECT_NE(0, file->Length());
@@ -33,7 +33,7 @@
 
 
 TEST_F(FileTest, FilePosition) {
-  std::string filename = GetLibCoreDexFileName();
+  std::string filename(GetLibCoreDexFileName());
   UniquePtr<File> file(OS::OpenFile(filename.c_str(), false));
   ASSERT_TRUE(file.get() != NULL);
   char buf[4];
@@ -45,7 +45,7 @@
 
 
 TEST_F(FileTest, FileFd) {
-  std::string filename = GetLibCoreDexFileName();
+  std::string filename(GetLibCoreDexFileName());
   UniquePtr<File> file(OS::OpenFile(filename.c_str(), false));
   ASSERT_TRUE(file.get() != NULL);
   EXPECT_NE(-1, file->Fd());