diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-05 15:53:29 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-05 15:53:29 -0200 |
| commit | 812767d2bb4e201b4f826fd31924d2cafb8fe0ae (patch) | |
| tree | 3e3dbc65eb273c201d08a9eaf227f857e2a62358 /lib/libc/resolv/mtctxres.c | |
| parent | c1d136c87f2377fd07592928003e67490eb479a6 (diff) | |
| parent | b0e9d555db88639874b99e5151bf5981a8223322 (diff) | |
| download | FreeBSD-src-812767d2bb4e201b4f826fd31924d2cafb8fe0ae.zip FreeBSD-src-812767d2bb4e201b4f826fd31924d2cafb8fe0ae.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib/libc/resolv/mtctxres.c')
| -rw-r--r-- | lib/libc/resolv/mtctxres.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libc/resolv/mtctxres.c b/lib/libc/resolv/mtctxres.c index f02a7f5..c2aea38 100644 --- a/lib/libc/resolv/mtctxres.c +++ b/lib/libc/resolv/mtctxres.c @@ -75,7 +75,7 @@ __res_init_ctx(void) { return (0); } - if ((mt = malloc(sizeof (mtctxres_t))) == 0) { + if ((mt = malloc(sizeof(mtctxres_t))) == NULL) { errno = ENOMEM; return (-1); } @@ -94,10 +94,7 @@ __res_init_ctx(void) { static void __res_destroy_ctx(void *value) { - mtctxres_t *mt = (mtctxres_t *)value; - - if (mt != 0) - free(mt); + free(value); } #endif @@ -130,9 +127,9 @@ ___mtctxres(void) { * that fails return a global context. */ if (mt_key_initialized) { - if (((mt = pthread_getspecific(key)) != 0) || + if (((mt = pthread_getspecific(key)) != NULL) || (__res_init_ctx() == 0 && - (mt = pthread_getspecific(key)) != 0)) { + (mt = pthread_getspecific(key)) != NULL)) { return (mt); } } |
