From b71bf8eb214894d11db77eae78a9abb8c4cebf44 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Wed, 13 Apr 2016 01:30:13 +0200
Subject: [PATCH] Revert "Fixing a couple of issues within core."
This reverts commit 5b304753965d4179f374b5cded063e79d3d17b0a.
---
src/core/lib/channel/channel_args.c | 3 +--
src/core/lib/surface/server.c | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/core/lib/channel/channel_args.c b/src/core/lib/channel/channel_args.c
index 97c40e8481..28d2d78d00 100644
--- a/src/core/lib/channel/channel_args.c
+++ b/src/core/lib/channel/channel_args.c
@@ -74,8 +74,7 @@ grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src,
return dst;
}
dst->num_args = src_num_args + num_to_add;
- dst->args =
- dst->num_args ? gpr_malloc(sizeof(grpc_arg) * dst->num_args) : NULL;
+ dst->args = gpr_malloc(sizeof(grpc_arg) * dst->num_args);
for (i = 0; i < src_num_args; i++) {
dst->args[i] = copy_arg(&src->args[i]);
}
diff --git a/src/core/lib/surface/server.c b/src/core/lib/surface/server.c
index e3b54ac012..ad8ee8c7a9 100644
--- a/src/core/lib/surface/server.c
+++ b/src/core/lib/surface/server.c
@@ -251,9 +251,7 @@ static void channel_broadcaster_init(grpc_server *s, channel_broadcaster *cb) {
count++;
}
cb->num_channels = count;
- cb->channels = cb->num_channels
- ? gpr_malloc(sizeof(*cb->channels) * cb->num_channels)
- : NULL;
+ cb->channels = gpr_malloc(sizeof(*cb->channels) * cb->num_channels);
count = 0;
for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) {
cb->channels[count++] = c->channel;
--
GitLab