Merge pull request #11645 from ncteisen/musl-fix

Fix musl Portability
pull/11659/head
Noah Eisen 8 years ago committed by GitHub
commit cd4e69fc03
  1. 5
      src/core/lib/iomgr/ev_epollsig_linux.c
  2. 5
      src/core/lib/iomgr/ev_poll_posix.c

@ -840,11 +840,6 @@ static grpc_fd *fd_create(int fd, const char *name) {
char *fd_name; char *fd_name;
gpr_asprintf(&fd_name, "%s fd=%d", name, fd); gpr_asprintf(&fd_name, "%s fd=%d", name, fd);
grpc_iomgr_register_object(&new_fd->iomgr_object, fd_name); grpc_iomgr_register_object(&new_fd->iomgr_object, fd_name);
#ifndef NDEBUG
if (GRPC_TRACER_ON(grpc_trace_fd_refcount)) {
gpr_log(GPR_DEBUG, "FD %d %p create %s", fd, new_fd, fd_name);
}
#endif
gpr_free(fd_name); gpr_free(fd_name);
return new_fd; return new_fd;
} }

@ -323,11 +323,6 @@ static grpc_fd *fd_create(int fd, const char *name) {
gpr_asprintf(&name2, "%s fd=%d", name, fd); gpr_asprintf(&name2, "%s fd=%d", name, fd);
grpc_iomgr_register_object(&r->iomgr_object, name2); grpc_iomgr_register_object(&r->iomgr_object, name2);
gpr_free(name2); gpr_free(name2);
#ifndef NDEBUG
if (GRPC_TRACER_ON(grpc_trace_fd_refcount)) {
gpr_log(GPR_DEBUG, "FD %d %p create %s", fd, r, name);
}
#endif
return r; return r;
} }

Loading…
Cancel
Save