From b6a080d6a3db4ab1630c3bf2109849d2b8a8c11e Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 28 Aug 2013 16:07:30 +0000 Subject: [PATCH] Match use of ast_free() with ast_calloc() and add some curly braces. ........ Merged revisions 397856 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397857 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/threadstorage.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h index e204748ba4..e3ece8b67f 100644 --- a/include/asterisk/threadstorage.h +++ b/include/asterisk/threadstorage.h @@ -177,10 +177,11 @@ void *ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size), pthread_once(&ts->once, ts->key_init); if (!(buf = pthread_getspecific(ts->key))) { - if (!(buf = ast_calloc(1, init_size))) + if (!(buf = ast_calloc(1, init_size))) { return NULL; + } if (ts->custom_init && ts->custom_init(buf)) { - free(buf); + ast_free(buf); return NULL; } pthread_setspecific(ts->key, buf); @@ -197,10 +198,11 @@ void *__ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size, co pthread_once(&ts->once, ts->key_init); if (!(buf = pthread_getspecific(ts->key))) { - if (!(buf = ast_calloc(1, init_size))) + if (!(buf = ast_calloc(1, init_size))) { return NULL; + } if (ts->custom_init && ts->custom_init(buf)) { - free(buf); + ast_free(buf); return NULL; } pthread_setspecific(ts->key, buf);