Match use of ast_free() with ast_calloc() and add some curly braces.
authorRichard Mudgett <rmudgett@digium.com>
Wed, 28 Aug 2013 16:07:30 +0000 (16:07 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 28 Aug 2013 16:07:30 +0000 (16:07 +0000)
........

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

index e204748..e3ece8b 100644 (file)
@@ -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);