summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 01:40:47 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-18 01:40:47 +0000
commit481c3e82e2dcbcb676501f18bc8f58900071b935 (patch)
treeb41b70589f0b082edffa7322b1c06af23c4b32bc /jingle
parentcf85b9ad701b8363e3d1d54d54390dcdf4a45291 (diff)
downloadchromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.zip
chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.tar.gz
chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.tar.bz2
Fixes for re-enabling more MSVC level 4 warnings: misc edition #2
This contains fixes for the following sorts of issues: * Assignment inside conditional * Taking the address of a temporary * Octal escape sequence terminated by decimal number * Signedness mismatch * Possibly-uninitialized local variable This also contains a small number of cleanups to nearby code (e.g. no else after return). BUG=81439 TEST=none Review URL: https://codereview.chromium.org/382673002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/thread_wrapper_unittest.cc2
-rw-r--r--jingle/glue/utils.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc
index 8230297..3657780 100644
--- a/jingle/glue/thread_wrapper_unittest.cc
+++ b/jingle/glue/thread_wrapper_unittest.cc
@@ -298,7 +298,7 @@ TEST_F(ThreadWrapperTest, SendDuringSend) {
}
TEST_F(ThreadWrapperTest, Dispose) {
- bool deleted_;
+ bool deleted_ = false;
thread_->Dispose(new DeletableObject(&deleted_));
EXPECT_FALSE(deleted_);
message_loop_.RunUntilIdle();
diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc
index bc548ea..5350631 100644
--- a/jingle/glue/utils.cc
+++ b/jingle/glue/utils.cc
@@ -62,13 +62,13 @@ bool DeserializeP2PCandidate(const std::string& candidate_str,
static_cast<base::DictionaryValue*>(value.get());
std::string ip;
- int port;
+ int port = 0;
std::string type;
std::string protocol;
std::string username;
std::string password;
- double preference;
- int generation;
+ double preference = 0;
+ int generation = 0;
if (!dic_value->GetString("ip", &ip) ||
!dic_value->GetInteger("port", &port) ||