diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 13:20:12 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 13:20:12 -0500 |
| commit | 7df2e1c3797df638016ae6d7a34e1781c0f1ced5 (patch) | |
| tree | 2c7aa125a2e684ce5e2d91b37e4fc1e4dab7b024 /lib/thread.c | |
| parent | 84ea764321362381cfc2b426ef0f3329857bc83f (diff) | |
| parent | 2cfe3d285ff001046b579434dea5f963082630dd (diff) | |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/thread.c b/lib/thread.c index 28245d11a2..c1558a83e1 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -362,8 +362,8 @@ thread_master_create (void) #if defined(HAVE_POLL) rv->handler.pfdsize = rv->fd_limit; rv->handler.pfdcount = 0; - rv->handler.pfds = (struct pollfd *) malloc (sizeof (struct pollfd) * rv->handler.pfdsize); - memset (rv->handler.pfds, 0, sizeof (struct pollfd) * rv->handler.pfdsize); + rv->handler.pfds = XCALLOC (MTYPE_THREAD_MASTER, + sizeof (struct pollfd) * rv->handler.pfdsize); #endif return rv; } |