[svn-commits] tilghman: trunk r437 - in /trunk: chan_mobile.c res_config_mysql.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Sep  2 22:32:29 2007
New Revision: 437

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=437
Log:
Update API to match asterisk/trunk (closes issue #10628)

Modified:
    trunk/chan_mobile.c
    trunk/res_config_mysql.c

Modified: trunk/chan_mobile.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/chan_mobile.c?view=diff&rev=437&r1=436&r2=437
==============================================================================
--- trunk/chan_mobile.c (original)
+++ trunk/chan_mobile.c Sun Sep  2 22:32:29 2007
@@ -662,7 +662,6 @@
 {
 
 	struct mbl_pvt *pvt = ast->tech_pvt;
-	int r;
 	struct ast_frame *f;
 
 	if (!pvt->owner) {

Modified: trunk/res_config_mysql.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/res_config_mysql.c?view=diff&rev=437&r1=436&r2=437
==============================================================================
--- trunk/res_config_mysql.c (original)
+++ trunk/res_config_mysql.c Sun Sep  2 22:32:29 2007
@@ -169,12 +169,12 @@
 				for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
 					if (chunk && !ast_strlen_zero(ast_strip(chunk))) {
 						if (prev) {
-							prev->next = ast_variable_new(fields[i].name, chunk);
+							prev->next = ast_variable_new(fields[i].name, chunk, "");
 							if (prev->next) {
 								prev = prev->next;
 							}
 						} else {
-							prev = var = ast_variable_new(fields[i].name, chunk);
+							prev = var = ast_variable_new(fields[i].name, chunk, "");
 						}
 					}
 				}
@@ -286,7 +286,7 @@
 
 		while ((row = mysql_fetch_row(result))) {
 			var = NULL;
-			cat = ast_category_new("");
+			cat = ast_category_new("", "", -1);
 			if (!cat) {
 				ast_log(LOG_WARNING, "Out of memory!\n");
 				continue;
@@ -299,7 +299,7 @@
 						if (initfield && !strcmp(initfield, fields[i].name)) {
 							ast_category_rename(cat, chunk);
 						}
-						var = ast_variable_new(fields[i].name, chunk);
+						var = ast_variable_new(fields[i].name, chunk, "");
 						ast_variable_append(cat, var);
 					}
 				}
@@ -534,7 +534,7 @@
 	return (int)numrows;
 }
  
-static struct ast_config *config_mysql(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags config_flags)
+static struct ast_config *config_mysql(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags config_flags, const char *unused)
 {
 	MYSQL_RES *result;
 	MYSQL_ROW row;
@@ -581,7 +581,7 @@
 
 		while ((row = mysql_fetch_row(result))) {
 			if (!strcmp(row[1], "#include")) {
-				if (!ast_config_internal_load(row[2], cfg, config_flags)) {
+				if (!ast_config_internal_load(row[2], cfg, config_flags, "")) {
 					mysql_free_result(result);
 					ast_mutex_unlock(&dbread.lock);
 					ast_config_destroy(cfg);
@@ -591,7 +591,7 @@
 			}
 
 			if (strcmp(last, row[0]) || last_cat_metric != atoi(row[3])) {
-				cur_cat = ast_category_new(row[0]);
+				cur_cat = ast_category_new(row[0], "", -1);
 				if (!cur_cat) {
 					ast_log(LOG_WARNING, "Out of memory!\n");
 					break;
@@ -600,7 +600,7 @@
 				last_cat_metric = atoi(row[3]);
 				ast_category_append(cfg, cur_cat);
 			}
-			new_v = ast_variable_new(row[1], row[2]);
+			new_v = ast_variable_new(row[1], row[2], "");
 			if (cur_cat)
 				ast_variable_append(cur_cat, new_v);
 		}