Index: func_odbc.c =================================================================== --- func_odbc.c (revision 18783) +++ func_odbc.c (working copy) @@ -418,11 +418,11 @@ (*query)->acf = calloc(1, sizeof(struct ast_custom_function)); if ((*query)->acf) { - asprintf(&((*query)->acf->name), "ODBC_%s", catg); - asprintf(&((*query)->acf->syntax), "ODBC_%s([...[,]])", catg); + asprintf((char **)&((*query)->acf->name), "ODBC_%s", catg); + asprintf((char **)&((*query)->acf->syntax), "ODBC_%s([...[,]])", catg); (*query)->acf->synopsis = "Runs the referenced query with the specified arguments"; if (!ast_strlen_zero((*query)->sql_read) && !ast_strlen_zero((*query)->sql_write)) { - asprintf(&((*query)->acf->desc), + asprintf((char **)&((*query)->acf->desc), "Runs the following query, as defined in func_odbc.conf, performing\n" "substitution of the arguments into the query as specified by ${ARG1},\n" "${ARG2}, ... ${ARGn}. When setting the function, the values are provided\n" @@ -431,19 +431,19 @@ (*query)->sql_read, (*query)->sql_write); } else if (!ast_strlen_zero((*query)->sql_read)) { - asprintf(&((*query)->acf->desc), + asprintf((char **)&((*query)->acf->desc), "Runs the following query, as defined in func_odbc.conf, performing\n" "substitution of the arguments into the query as specified by ${ARG1},\n" "${ARG2}, ... ${ARGn}. This function may only be read, not set.\n\nSQL:\n%s\n", (*query)->sql_read); } else if (!ast_strlen_zero((*query)->sql_write)) { - asprintf(&((*query)->acf->desc), + asprintf((char **)&((*query)->acf->desc), "Runs the following query, as defined in func_odbc.conf, performing\n" "substitution of the arguments into the query as specified by ${ARG1},\n" "${ARG2}, ... ${ARGn}. The values are provided either in whole as\n" "${VALUE} or parsed as ${VAL1}, ${VAL2}, ... ${VALn}.\n" "This function may only be set.\nSQL:\n%s\n", - (*query)->sql_write); + (char *)(*query)->sql_write); } if (ast_strlen_zero((*query)->sql_read)) { @@ -472,11 +472,11 @@ if (query) { if (query->acf) { if (query->acf->name) - free(query->acf->name); + free((void *)query->acf->name); if (query->acf->syntax) - free(query->acf->syntax); + free((void *)query->acf->syntax); if (query->acf->desc) - free(query->acf->desc); + free((void *)query->acf->desc); free(query->acf); } free(query);