summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@users.noreply.github.com>2018-07-02 12:41:34 -0400
committerGitHub <noreply@github.com>2018-07-02 12:41:34 -0400
commitfeed25a9a5c5a8229f1fc6bf7da047853afb96e4 (patch)
tree03d99dae4d0405f75bfbc2ca0a21300cbdb14f3b
parent36789dd4b51887968d9481b57f5cb12465e73f22 (diff)
parent885c8244cf3c489aac096202486e4d20491612f4 (diff)
Merge pull request #2600 from pacovn/PVS-Studio_sizeof_and_dead_code
eigrpd: sizeof() usage + dead code (PVS-Studio)
-rw-r--r--eigrpd/eigrp_packet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index fab21e5201..027f30563f 100644
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -566,7 +566,7 @@ int eigrp_read(struct thread *thread)
// return -1;
/* If incoming interface is passive one, ignore it. */
- if (ei && eigrp_if_is_passive(ei)) {
+ if (eigrp_if_is_passive(ei)) {
char buf[3][INET_ADDRSTRLEN];
if (IS_DEBUG_EIGRP_TRANSMIT(0, RECV))
@@ -725,12 +725,12 @@ static struct stream *eigrp_recv_packet(int fd, struct interface **ifp,
zlog_warn("stream_recvmsg failed: %s", safe_strerror(errno));
return NULL;
}
- if ((unsigned int)ret < sizeof(iph)) /* ret must be > 0 now */
+ if ((unsigned int)ret < sizeof(*iph)) /* ret must be > 0 now */
{
zlog_warn(
"eigrp_recv_packet: discarding runt packet of length %d "
"(ip header size is %u)",
- ret, (unsigned int)sizeof(iph));
+ ret, (unsigned int)sizeof(*iph));
return NULL;
}