Merge pull request #3570 from bluca/static_analysis

Static analysis warnings
This commit is contained in:
Simon Giesecke 2019-07-10 18:49:10 +02:00 committed by GitHub
commit 02f7dca678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions

View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -x set -x
set -e
cd ../../ cd ../../

View File

@ -396,8 +396,8 @@ void zmq::udp_engine_t::out_event ()
if (rc == 0) { if (rc == 0) {
msg_t body_msg; msg_t body_msg;
rc = _session->pull_msg (&body_msg); rc = _session->pull_msg (&body_msg);
// TODO rc is not checked here. We seem to assume rc == 0. An // If there's a group, there should also be a body
// assertion should be added. errno_assert (rc == 0);
const size_t group_size = group_msg.size (); const size_t group_size = group_msg.size ();
const size_t body_size = body_msg.size (); const size_t body_size = body_msg.size ();
@ -412,7 +412,7 @@ void zmq::udp_engine_t::out_event ()
rc = group_msg.close (); rc = group_msg.close ();
errno_assert (rc == 0); errno_assert (rc == 0);
body_msg.close (); rc = body_msg.close ();
errno_assert (rc == 0); errno_assert (rc == 0);
return; return;

View File

@ -339,7 +339,7 @@ void expect_monitor_event_v2 (void *monitor_,
} }
if (expected_remote_address_ if (expected_remote_address_
&& 0 != strcmp (remote_address, expected_remote_address_)) { && 0 != strcmp (remote_address, expected_remote_address_)) {
pos += snprintf (pos, sizeof buf - (pos - buf), snprintf (pos, sizeof buf - (pos - buf),
"Expected remote address %s, but received %s\n", "Expected remote address %s, but received %s\n",
expected_remote_address_, remote_address); expected_remote_address_, remote_address);
} }