summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/stream.c3
-rw-r--r--zebra/zebra_ptm.c16
2 files changed, 1 insertions, 18 deletions
diff --git a/lib/stream.c b/lib/stream.c
index c15baa0a2c..011e921c0d 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -145,8 +145,7 @@ struct stream *stream_dup(const struct stream *s)
STREAM_VERIFY_SANE(s);
- if ((snew = stream_new(s->endp)) == NULL)
- return NULL;
+ snew = stream_new(s->endp);
return (stream_copy(snew, s));
}
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index fda5ef02cf..3127d2d304 100644
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -1294,10 +1294,6 @@ static void zebra_ptm_send_bfdd(struct stream *msg)
/* Create copy for replication. */
msgc = stream_dup(msg);
- if (msgc == NULL) {
- zlog_debug("%s: not enough memory", __func__);
- return;
- }
/* Send message to all running BFDd daemons. */
for (ALL_LIST_ELEMENTS_RO(zrouter.client_list, node, client)) {
@@ -1308,10 +1304,6 @@ static void zebra_ptm_send_bfdd(struct stream *msg)
/* Allocate more messages. */
msg = stream_dup(msgc);
- if (msg == NULL) {
- zlog_debug("%s: not enough memory", __func__);
- return;
- }
}
stream_free(msgc);
@@ -1326,10 +1318,6 @@ static void zebra_ptm_send_clients(struct stream *msg)
/* Create copy for replication. */
msgc = stream_dup(msg);
- if (msgc == NULL) {
- zlog_debug("%s: not enough memory", __func__);
- return;
- }
/* Send message to all running client daemons. */
for (ALL_LIST_ELEMENTS_RO(zrouter.client_list, node, client)) {
@@ -1340,10 +1328,6 @@ static void zebra_ptm_send_clients(struct stream *msg)
/* Allocate more messages. */
msg = stream_dup(msgc);
- if (msg == NULL) {
- zlog_debug("%s: not enough memory", __func__);
- return;
- }
}
stream_free(msgc);