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

Logging callid: Fix some sizeof() references per coding guidelines.

Browse Source 
........

Merged revisions 405281 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 405282 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-01-10 18:17:48 +00:00
parent 42b087c2df
commit 4bde62eb40
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/logger.c
View File

@@ -1304,7 +1304,7 @@ struct ast_callid *ast_create_callid(void)
{ {
struct ast_callid *call; struct ast_callid *call;
call = ao2_alloc_options(sizeof(struct ast_callid), NULL, AO2_ALLOC_OPT_LOCK_NOLOCK); call = ao2_alloc_options(sizeof(*call), NULL, AO2_ALLOC_OPT_LOCK_NOLOCK);
if (!call) { if (!call) {
ast_log(LOG_ERROR, "Could not allocate callid struct.\n"); ast_log(LOG_ERROR, "Could not allocate callid struct.\n");
return NULL; return NULL;
@@ -1320,7 +1320,8 @@ struct ast_callid *ast_create_callid(void)
struct ast_callid *ast_read_threadstorage_callid(void) struct ast_callid *ast_read_threadstorage_callid(void)
{ {
struct ast_callid **callid; struct ast_callid **callid;
callid = ast_threadstorage_get(&unique_callid, sizeof(struct ast_callid **));
callid = ast_threadstorage_get(&unique_callid, sizeof(*callid));
if (callid && *callid) { if (callid && *callid) {
ast_callid_ref(*callid); ast_callid_ref(*callid);
return *callid; return *callid;
@@ -1332,8 +1333,7 @@ struct ast_callid *ast_read_threadstorage_callid(void)
int ast_callid_threadassoc_change(struct ast_callid *callid) int ast_callid_threadassoc_change(struct ast_callid *callid)
{ {
struct ast_callid **id = struct ast_callid **id = ast_threadstorage_get(&unique_callid, sizeof(*id));
ast_threadstorage_get(&unique_callid, sizeof(struct ast_callid **));
if (!id) { if (!id) {
ast_log(LOG_ERROR, "Failed to allocate thread storage.\n"); ast_log(LOG_ERROR, "Failed to allocate thread storage.\n");
@@ -1363,7 +1363,8 @@ int ast_callid_threadassoc_change(struct ast_callid *callid)
int ast_callid_threadassoc_add(struct ast_callid *callid) int ast_callid_threadassoc_add(struct ast_callid *callid)
{ {
struct ast_callid **pointing; struct ast_callid **pointing;
pointing = ast_threadstorage_get(&unique_callid, sizeof(struct ast_callid **));
pointing = ast_threadstorage_get(&unique_callid, sizeof(*pointing));
if (!(pointing)) { if (!(pointing)) {
ast_log(LOG_ERROR, "Failed to allocate thread storage.\n"); ast_log(LOG_ERROR, "Failed to allocate thread storage.\n");
return -1; return -1;
@@ -1387,7 +1388,8 @@ int ast_callid_threadassoc_add(struct ast_callid *callid)
int ast_callid_threadassoc_remove(void) int ast_callid_threadassoc_remove(void)
{ {
struct ast_callid **pointing; struct ast_callid **pointing;
pointing = ast_threadstorage_get(&unique_callid, sizeof(struct ast_callid **));
pointing = ast_threadstorage_get(&unique_callid, sizeof(*pointing));
if (!(pointing)) { if (!(pointing)) {
ast_log(LOG_ERROR, "Failed to allocate thread storage.\n"); ast_log(LOG_ERROR, "Failed to allocate thread storage.\n");
return -1; return -1;