kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match use of ast_free() with ast_calloc() and add some curly braces.

Browse Source 
........

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
This commit is contained in:
Richard Mudgett
2013-08-28 16:07:30 +00:00
parent a181544299
commit b6a080d6a3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/asterisk/threadstorage.h
View File

@@ -177,10 +177,11 @@ void *ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size),
pthread_once(&ts->once, ts->key_init); pthread_once(&ts->once, ts->key_init);
if (!(buf = pthread_getspecific(ts->key))) { if (!(buf = pthread_getspecific(ts->key))) {
if (!(buf = ast_calloc(1, init_size))) if (!(buf = ast_calloc(1, init_size))) {
return NULL; return NULL;
}
if (ts->custom_init && ts->custom_init(buf)) { if (ts->custom_init && ts->custom_init(buf)) {
free(buf); ast_free(buf);
return NULL; return NULL;
} }
pthread_setspecific(ts->key, buf); 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); pthread_once(&ts->once, ts->key_init);
if (!(buf = pthread_getspecific(ts->key))) { if (!(buf = pthread_getspecific(ts->key))) {
if (!(buf = ast_calloc(1, init_size))) if (!(buf = ast_calloc(1, init_size))) {
return NULL; return NULL;
}
if (ts->custom_init && ts->custom_init(buf)) { if (ts->custom_init && ts->custom_init(buf)) {
free(buf); ast_free(buf);
return NULL; return NULL;
} }
pthread_setspecific(ts->key, buf); pthread_setspecific(ts->key, buf);