Stop shadowing global name

pull/3488/head
Robbie Shade 9 years ago
parent 147fe701a0
commit 109a8dc6d8
  1. 4
      src/core/iomgr/udp_server.c
  2. 4
      src/core/iomgr/udp_server.h
  3. 2
      test/core/iomgr/udp_server_test.c

@ -405,12 +405,12 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index) {
void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *s,
grpc_pollset **pollsets, size_t pollset_count,
grpc_server *grpc_server) {
grpc_server *server) {
size_t i, j;
gpr_mu_lock(&s->mu);
GPR_ASSERT(s->active_ports == 0);
s->pollsets = pollsets;
s->grpc_server = grpc_server;
s->grpc_server = server;
for (i = 0; i < s->nports; i++) {
for (j = 0; j < pollset_count; j++) {
grpc_pollset_add_fd(exec_ctx, pollsets[j], s->ports[i].emfd);

@ -49,9 +49,9 @@ typedef void (*grpc_udp_server_read_cb)(int fd, grpc_server* server);
grpc_udp_server *grpc_udp_server_create(void);
/* Start listening to bound ports */
void grpc_udp_server_start(grpc_exec_ctx *exec_ctx grpc_udp_server *udp_server,
void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *udp_server,
grpc_pollset **pollsets, size_t pollset_count,
grpc_server *grpc_server);
grpc_server *server);
int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index);

@ -49,7 +49,7 @@ static grpc_pollset g_pollset;
static int g_number_of_reads = 0;
static int g_number_of_bytes_read = 0;
static void on_read(int fd, grpc_server *grpc_server) {
static void on_read(int fd, grpc_server *server) {
char read_buffer[512];
ssize_t byte_count;

Loading…
Cancel
Save