diff options
| author | Nico Weber <thakis@chromium.org> | 2014-08-29 15:41:53 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2014-08-29 23:04:13 +0000 |
| commit | d85710844c00acbfcf95f84ebcb6012d72eac645 (patch) | |
| tree | ae5aa1e78b186d0a9e142d269ed6248fbfcdd9bf /rlz | |
| parent | 62964a694ce67c5425344e2b6473724808a93f74 (diff) | |
| download | chromium_src-d85710844c00acbfcf95f84ebcb6012d72eac645.zip chromium_src-d85710844c00acbfcf95f84ebcb6012d72eac645.tar.gz chromium_src-d85710844c00acbfcf95f84ebcb6012d72eac645.tar.bz2 | |
clang/win: Fix a few warnings in targets not in chromium_builder_tests.
Also don't use "default" as a variable name, as it's a keyword.
Also fix a bug where a wstring was passed to %ls.
No real behavior change.
BUG=82385
R=hans@chromium.org
TBR=cpu, vitalybuka
Review URL: https://codereview.chromium.org/526513002
Cr-Commit-Position: refs/heads/master@{#292699}
Diffstat (limited to 'rlz')
| -rw-r--r-- | rlz/win/lib/machine_deal_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rlz/win/lib/machine_deal_test.cc b/rlz/win/lib/machine_deal_test.cc index 47b7265..ec0526f 100644 --- a/rlz/win/lib/machine_deal_test.cc +++ b/rlz/win/lib/machine_deal_test.cc @@ -72,7 +72,7 @@ TEST_F(MachineDealCodeTest, SetFromPingResponse) { // Bad responses - char* kBadDccResponse = + const char kBadDccResponse[] = "dcc: NotMyDCCode \r\n" "set_dcc: NewDCCode\r\n" "crc32: 1B4D6BB3"; @@ -81,7 +81,7 @@ TEST_F(MachineDealCodeTest, SetFromPingResponse) { EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50)); EXPECT_STREQ("MyDCCode", dcc_50); - char* kBadCrcResponse = + const char kBadCrcResponse[] = "dcc: MyDCCode \r\n" "set_dcc: NewDCCode\r\n" "crc32: 90707106"; @@ -92,7 +92,7 @@ TEST_F(MachineDealCodeTest, SetFromPingResponse) { // Good responses - char* kMissingSetResponse = + const char kMissingSetResponse[] = "dcc: MyDCCode \r\n" "crc32: 35F2E717"; EXPECT_TRUE(rlz_lib::MachineDealCode::SetFromPingResponse( @@ -100,7 +100,7 @@ TEST_F(MachineDealCodeTest, SetFromPingResponse) { EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50)); EXPECT_STREQ("MyDCCode", dcc_50); - char* kGoodResponse = + const char kGoodResponse[] = "dcc: MyDCCode \r\n" "set_dcc: NewDCCode\r\n" "crc32: C8540E02"; @@ -109,7 +109,7 @@ TEST_F(MachineDealCodeTest, SetFromPingResponse) { EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50)); EXPECT_STREQ("NewDCCode", dcc_50); - char* kGoodResponse2 = + const char kGoodResponse2[] = "set_dcc: NewDCCode2 \r\n" "dcc: NewDCCode \r\n" "crc32: 60B6409A"; @@ -119,7 +119,7 @@ TEST_F(MachineDealCodeTest, SetFromPingResponse) { EXPECT_STREQ("NewDCCode2", dcc_50); MachineDealCodeHelper::Clear(); - char* kGoodResponse3 = + const char kGoodResponse3[] = "set_dcc: NewDCCode \r\n" "crc32: 374C1C47"; EXPECT_TRUE(rlz_lib::MachineDealCode::SetFromPingResponse( @@ -128,7 +128,7 @@ TEST_F(MachineDealCodeTest, SetFromPingResponse) { EXPECT_STREQ("NewDCCode", dcc_50); MachineDealCodeHelper::Clear(); - char* kGoodResponse4 = + const char kGoodResponse4[] = "dcc: \r\n" "set_dcc: NewDCCode \r\n" "crc32: 0AB1FB39"; |