Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-06-06 21:20:11 +00:00
parent 033a3df22a
commit 9d05ff8ed5
94 changed files with 2530 additions and 2701 deletions

View File

@@ -211,7 +211,7 @@ static int load_config(void)
if (AST_LIST_FIRST(&(tableptr->columns)))
AST_RWLIST_INSERT_TAIL(&odbc_tables, tableptr, list);
else
free(tableptr);
ast_free(tableptr);
}
return res;
}

View File

@@ -218,22 +218,22 @@ static int odbc_unload_module(void)
if (dsn) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free dsn\n");
free(dsn);
ast_free(dsn);
}
if (username) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free username\n");
free(username);
ast_free(username);
}
if (password) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free password\n");
free(password);
ast_free(password);
}
if (table) {
if (option_verbose > 10)
ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: free table\n");
free(table);
ast_free(table);
}
ast_cdr_unregister(name);

View File

@@ -184,17 +184,17 @@ static int my_unload_module(void)
if (conn)
PQfinish(conn);
if (pghostname)
free(pghostname);
ast_free(pghostname);
if (pgdbname)
free(pgdbname);
ast_free(pgdbname);
if (pgdbuser)
free(pgdbuser);
ast_free(pgdbuser);
if (pgpassword)
free(pgpassword);
ast_free(pgpassword);
if (pgdbport)
free(pgdbport);
ast_free(pgdbport);
if (table)
free(table);
ast_free(table);
ast_cdr_unregister(name);
return 0;
}

View File

@@ -161,7 +161,7 @@ static int sqlite_log(struct ast_cdr *cdr)
if (zErr) {
ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr);
free(zErr);
ast_free(zErr);
}
ast_mutex_unlock(&sqlite_lock);
@@ -190,7 +190,7 @@ static int load_module(void)
db = sqlite_open(fn, AST_FILE_MODE, &zErr);
if (!db) {
ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr);
free(zErr);
ast_free(zErr);
return -1;
}
@@ -200,7 +200,7 @@ static int load_module(void)
res = sqlite_exec(db, sql_create_table, NULL, NULL, &zErr);
if (res) {
ast_log(LOG_ERROR, "cdr_sqlite: Unable to create table 'cdr': %s\n", zErr);
free(zErr);
ast_free(zErr);
goto err;
}

View File

@@ -221,16 +221,16 @@ static int tds_log(struct ast_cdr *cdr)
}
} while (!connected && !retried);
free(accountcode);
free(src);
free(dst);
free(dcontext);
free(clid);
free(channel);
free(dstchannel);
free(lastapp);
free(lastdata);
free(uniqueid);
ast_free(accountcode);
ast_free(src);
ast_free(dst);
ast_free(dcontext);
ast_free(clid);
ast_free(channel);
ast_free(dstchannel);
ast_free(lastapp);
ast_free(lastdata);
ast_free(uniqueid);
ast_mutex_unlock(&tds_lock);
@@ -246,7 +246,7 @@ static char *anti_injection(const char *str, int len)
char *known_bad[] = {"select", "insert", "update", "delete", "drop", ";", "--", "\0"};
int idx;
if ((buf = malloc(len + 1)) == NULL)
if ((buf = ast_malloc(len + 1)) == NULL)
{
ast_log(LOG_ERROR, "cdr_tds: Out of memory error\n");
return NULL;
@@ -413,13 +413,13 @@ static int tds_unload_module(void)
ast_cdr_unregister(name);
if (hostname) free(hostname);
if (dbname) free(dbname);
if (dbuser) free(dbuser);
if (password) free(password);
if (charset) free(charset);
if (language) free(language);
if (table) free(table);
if (hostname) ast_free(hostname);
if (dbname) ast_free(dbname);
if (dbuser) ast_free(dbuser);
if (password) ast_free(password);
if (charset) ast_free(charset);
if (language) ast_free(language);
if (table) ast_free(table);
return 0;
}