summaryrefslogtreecommitdiff
path: root/subprocess_unittest.cc
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@chromium.org>2014-06-16 13:19:00 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-06-18 01:39:59 +0000
commitd2779df63aaad8b65fc5d4badee7dbc9bed7f2b6 (patch)
treee34a511ee4068d8d9cd46a992a4e147f3afbd351 /subprocess_unittest.cc
parentb683327ed3f50ef89324069fc87ee076b65bee46 (diff)
update_engine: fixed warnings from cpplint
Fixed all the cpplint warnings in update engine. BUG=None TEST=Unit tests still pass. Change-Id: I285ae858eec8abe0b26ff203b99a42a200ceb71c Reviewed-on: https://chromium-review.googlesource.com/204027 Reviewed-by: Alex Vakulenko <avakulenko@chromium.org> Tested-by: Alex Vakulenko <avakulenko@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'subprocess_unittest.cc')
-rw-r--r--subprocess_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/subprocess_unittest.cc b/subprocess_unittest.cc
index efda13b2..f625519d 100644
--- a/subprocess_unittest.cc
+++ b/subprocess_unittest.cc
@@ -66,7 +66,7 @@ gboolean LaunchEchoInMainLoop(gpointer data) {
Subprocess::Get().Exec(cmd, CallbackEcho, data);
return FALSE;
}
-} // namespace {}
+} // namespace
TEST(SubprocessTest, SimpleTest) {
GMainLoop *loop = g_main_loop_new(g_main_context_default(), FALSE);
@@ -154,7 +154,8 @@ gboolean StartAndCancelInRunLoop(gpointer data) {
const char* listening_port_str =
line + strlen(kServerListeningMsgPrefix);
char* end_ptr;
- long raw_port = strtol(listening_port_str, &end_ptr, 10);
+ long raw_port = strtol(listening_port_str, // NOLINT(runtime/int)
+ &end_ptr, 10);
CHECK(!*end_ptr || *end_ptr == '\n');
local_server_port = static_cast<in_port_t>(raw_port);
break;
@@ -173,7 +174,7 @@ gboolean StartAndCancelInRunLoop(gpointer data) {
Subprocess::Get().CancelExec(tag);
return FALSE;
}
-} // namespace {}
+} // namespace
gboolean ExitWhenDone(gpointer data) {
CancelTestData* cancel_test_data = reinterpret_cast<CancelTestData*>(data);