aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/res_config_odbc.c16
-rw-r--r--res/res_config_pgsql.c18
-rw-r--r--res/res_config_sqlite.c19
3 files changed, 26 insertions, 27 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 1faf28dfc..6ce00ffa6 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -219,11 +219,11 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
chunk = strsep(&stringp, ";");
if (!ast_strlen_zero(ast_strip(chunk))) {
if (prev) {
- prev->next = ast_variable_new(coltitle, chunk);
+ prev->next = ast_variable_new(coltitle, chunk, "");
if (prev->next)
prev = prev->next;
} else
- prev = var = ast_variable_new(coltitle, chunk);
+ prev = var = ast_variable_new(coltitle, chunk, "");
}
}
}
@@ -334,7 +334,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
ast_log(LOG_WARNING, "SQL Fetch error!\n[%s]\n\n", sql);
continue;
}
- cat = ast_category_new("");
+ cat = ast_category_new("","",99999);
if (!cat) {
ast_log(LOG_WARNING, "Out of memory!\n");
continue;
@@ -366,7 +366,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
if (!ast_strlen_zero(ast_strip(chunk))) {
if (initfield && !strcmp(initfield, coltitle))
ast_category_rename(cat, chunk);
- var = ast_variable_new(coltitle, chunk);
+ var = ast_variable_new(coltitle, chunk, "");
ast_variable_append(cat, var);
}
}
@@ -625,7 +625,7 @@ static SQLHSTMT config_odbc_prepare(struct odbc_obj *obj, void *data)
return sth;
}
-static struct ast_config *config_odbc(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags flags)
+static struct ast_config *config_odbc(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags flags, const char *sugg_incl)
{
struct ast_variable *new_v;
struct ast_category *cur_cat;
@@ -682,7 +682,7 @@ static struct ast_config *config_odbc(const char *database, const char *table, c
while ((res = SQLFetch(stmt)) != SQL_NO_DATA) {
if (!strcmp (q.var_name, "#include")) {
- if (!ast_config_internal_load(q.var_val, cfg, loader_flags)) {
+ if (!ast_config_internal_load(q.var_val, cfg, loader_flags, "")) {
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
return NULL;
@@ -690,7 +690,7 @@ static struct ast_config *config_odbc(const char *database, const char *table, c
continue;
}
if (strcmp(last, q.category) || last_cat_metric != q.cat_metric) {
- cur_cat = ast_category_new(q.category);
+ cur_cat = ast_category_new(q.category, "", 99999);
if (!cur_cat) {
ast_log(LOG_WARNING, "Out of memory!\n");
break;
@@ -700,7 +700,7 @@ static struct ast_config *config_odbc(const char *database, const char *table, c
ast_category_append(cfg, cur_cat);
}
- new_v = ast_variable_new(q.var_name, q.var_val);
+ new_v = ast_variable_new(q.var_name, q.var_val, "");
ast_variable_append(cur_cat, new_v);
}
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 8bd2322d1..dc1d8a02c 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -175,12 +175,12 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
chunk = strsep(&stringp, ";");
if (!ast_strlen_zero(ast_strip(chunk))) {
if (prev) {
- prev->next = ast_variable_new(fieldnames[i], chunk);
+ prev->next = ast_variable_new(fieldnames[i], chunk, "");
if (prev->next) {
prev = prev->next;
}
} else {
- prev = var = ast_variable_new(fieldnames[i], chunk);
+ prev = var = ast_variable_new(fieldnames[i], chunk, "");
}
}
}
@@ -313,7 +313,7 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char
for (rowIndex = 0; rowIndex < num_rows; rowIndex++) {
var = NULL;
- if (!(cat = ast_category_new("")))
+ if (!(cat = ast_category_new("","",99999)))
continue;
for (i = 0; i < numFields; i++) {
stringp = PQgetvalue(result, rowIndex, i);
@@ -323,7 +323,7 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char
if (initfield && !strcmp(initfield, fieldnames[i])) {
ast_category_rename(cat, chunk);
}
- var = ast_variable_new(fieldnames[i], chunk);
+ var = ast_variable_new(fieldnames[i], chunk, "");
ast_variable_append(cat, var);
}
}
@@ -615,8 +615,8 @@ static int destroy_pgsql(const char *database, const char *table, const char *ke
static struct ast_config *config_pgsql(const char *database, const char *table,
- const char *file, struct ast_config *cfg,
- struct ast_flags flags)
+ const char *file, struct ast_config *cfg,
+ struct ast_flags flags, const char *suggested_incl)
{
PGresult *result = NULL;
long num_rows;
@@ -681,7 +681,7 @@ static struct ast_config *config_pgsql(const char *database, const char *table,
char *field_var_val = PQgetvalue(result, rowIndex, 2);
char *field_cat_metric = PQgetvalue(result, rowIndex, 3);
if (!strcmp(field_var_name, "#include")) {
- if (!ast_config_internal_load(field_var_val, cfg, flags)) {
+ if (!ast_config_internal_load(field_var_val, cfg, flags, "")) {
PQclear(result);
ast_mutex_unlock(&pgsql_lock);
return NULL;
@@ -690,14 +690,14 @@ static struct ast_config *config_pgsql(const char *database, const char *table,
}
if (strcmp(last, field_category) || last_cat_metric != atoi(field_cat_metric)) {
- cur_cat = ast_category_new(field_category);
+ cur_cat = ast_category_new(field_category, "", 99999);
if (!cur_cat)
break;
strcpy(last, field_category);
last_cat_metric = atoi(field_cat_metric);
ast_category_append(cfg, cur_cat);
}
- new_v = ast_variable_new(field_var_name, field_var_val);
+ new_v = ast_variable_new(field_var_name, field_var_val, "");
ast_variable_append(cur_cat, new_v);
}
} else {
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 34912eaac..2f9cdedd4 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -305,9 +305,8 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames);
* \retval NULL if an error occurred
* \see add_cfg_entry()
*/
-static struct ast_config * config_handler(const char *database,
- const char *table, const char *file,
- struct ast_config *cfg, struct ast_flags flags);
+static struct ast_config * config_handler(const char *database, const char *table, const char *file,
+struct ast_config *cfg, struct ast_flags flags, const char *suggested_incl);
/*!
* \brief Helper function to parse a va_list object into 2 dynamic arrays of
@@ -736,7 +735,7 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames)
args = arg;
if (!args->cat_name || strcmp(args->cat_name, argv[RES_SQLITE_CONFIG_CATEGORY])) {
- args->cat = ast_category_new(argv[RES_SQLITE_CONFIG_CATEGORY]);
+ args->cat = ast_category_new(argv[RES_SQLITE_CONFIG_CATEGORY], "", 99999);
if (!args->cat) {
ast_log(LOG_WARNING, "Unable to allocate category\n");
@@ -755,7 +754,7 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames)
}
var = ast_variable_new(argv[RES_SQLITE_CONFIG_VAR_NAME],
- argv[RES_SQLITE_CONFIG_VAR_VAL]);
+ argv[RES_SQLITE_CONFIG_VAR_VAL], "");
if (!var) {
ast_log(LOG_WARNING, "Unable to allocate variable");
@@ -767,8 +766,8 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames)
return 0;
}
-static struct ast_config *config_handler(const char *database,
- const char *table, const char *file, struct ast_config *cfg, struct ast_flags flags)
+static struct ast_config *config_handler(const char *database, const char *table, const char *file,
+struct ast_config *cfg, struct ast_flags flags, const char *suggested_incl)
{
struct cfg_entry_args args;
char *errormsg;
@@ -856,7 +855,7 @@ static int add_rt_cfg_entry(void *arg, int argc, char **argv, char **columnNames
if (!argv[i])
continue;
- if (!(var = ast_variable_new(columnNames[i], argv[i])))
+ if (!(var = ast_variable_new(columnNames[i], argv[i], "")))
return 1;
if (!args->var)
@@ -990,7 +989,7 @@ static int add_rt_multi_cfg_entry(void *arg, int argc, char **argv, char **colum
return 1;
}
- if (!(cat = ast_category_new(cat_name))) {
+ if (!(cat = ast_category_new(cat_name, "", 99999))) {
ast_log(LOG_WARNING, "Unable to allocate category\n");
return 1;
}
@@ -1001,7 +1000,7 @@ static int add_rt_multi_cfg_entry(void *arg, int argc, char **argv, char **colum
if (!argv[i] || !strcmp(args->initfield, columnNames[i]))
continue;
- if (!(var = ast_variable_new(columnNames[i], argv[i]))) {
+ if (!(var = ast_variable_new(columnNames[i], argv[i], ""))) {
ast_log(LOG_WARNING, "Unable to allocate variable\n");
return 1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 16:44:26 +0000