mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 20:08:17 +00:00
bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -825,9 +825,13 @@ static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_qu
|
||||
}
|
||||
|
||||
if ((tmp = ast_variable_retrieve(cfg, catg, "prefix")) && !ast_strlen_zero(tmp)) {
|
||||
asprintf((char **)&((*query)->acf->name), "%s_%s", tmp, catg);
|
||||
if (asprintf((char **)&((*query)->acf->name), "%s_%s", tmp, catg) < 0) {
|
||||
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
||||
}
|
||||
} else {
|
||||
asprintf((char **)&((*query)->acf->name), "ODBC_%s", catg);
|
||||
if (asprintf((char **)&((*query)->acf->name), "ODBC_%s", catg) < 0) {
|
||||
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
||||
}
|
||||
}
|
||||
|
||||
if (!((*query)->acf->name)) {
|
||||
|
||||
Reference in New Issue
Block a user