[asterisk-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r191217 - in /team/jpeeler/ast...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Apr 29 18:02:04 2009
New Revision: 191217

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=191217
Log:
sync with trunk

Modified:
    team/jpeeler/asterisk-sigwork-trunk/   (props changed)
    team/jpeeler/asterisk-sigwork-trunk/main/pbx.c
    team/jpeeler/asterisk-sigwork-trunk/res/res_phoneprov.c

Propchange: team/jpeeler/asterisk-sigwork-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 29 18:02:04 2009
@@ -1,1 +1,1 @@
-/trunk:1-191192
+/trunk:1-191216

Modified: team/jpeeler/asterisk-sigwork-trunk/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/main/pbx.c?view=diff&rev=191217&r1=191216&r2=191217
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/main/pbx.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/main/pbx.c Wed Apr 29 18:02:04 2009
@@ -3605,7 +3605,7 @@
 						cp4 = ast_func_read2(c, finalvars, &substr3, 0) ? NULL : ast_str_buffer(substr3);
 						/* Don't deallocate the varshead that was passed in */
 						memcpy(&bogus->varshead, &old, sizeof(bogus->varshead));
-						ast_channel_free(bogus);
+						ast_channel_release(bogus);
 					} else {
 						ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution.  Function results may be blank.\n");
 					}
@@ -3694,7 +3694,7 @@
 void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead *headp, const char *cp1, char *cp2, int count, size_t *used)
 {
 	/* Substitutes variables into cp2, based on string cp1, cp2 NO LONGER NEEDS TO BE ZEROED OUT!!!!  */
-	char *cp4;
+	char *cp4 = NULL;
 	const char *tmp, *whereweare, *orig_cp2 = cp2;
 	int length, offset, offset2, isfunction;
 	char *workspace = NULL;
@@ -3805,8 +3805,9 @@
 						/* Don't deallocate the varshead that was passed in */
 						memcpy(&bogus->varshead, &old, sizeof(bogus->varshead));
 						bogus = ast_channel_release(bogus);
-					} else
+					} else {
 						ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution.  Function results may be blank.\n");
+					}
 				}
 				ast_debug(2, "Function result is '%s'\n", cp4 ? cp4 : "(null)");
 			} else {

Modified: team/jpeeler/asterisk-sigwork-trunk/res/res_phoneprov.c
URL: http://svn.digium.com/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/res/res_phoneprov.c?view=diff&rev=191217&r1=191216&r2=191217
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/res/res_phoneprov.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/res/res_phoneprov.c Wed Apr 29 18:02:04 2009
@@ -1102,7 +1102,7 @@
 	return pp_each_user_helper(chan, data, buf, NULL, len);
 }
 
-static int pp_each_user_read2(struct ast_channel *chan, const char *cmd, char *data, struct ast_str **buf, int len)
+static int pp_each_user_read2(struct ast_channel *chan, const char *cmd, char *data, struct ast_str **buf, ssize_t len)
 {
 	return pp_each_user_helper(chan, data, NULL, buf, len);
 }
@@ -1188,7 +1188,7 @@
 	return pp_each_extension_helper(chan, cmd, data, buf, NULL, len);
 }
 
-static int pp_each_extension_read2(struct ast_channel *chan, const char *cmd, char *data, struct ast_str **buf, int len)
+static int pp_each_extension_read2(struct ast_channel *chan, const char *cmd, char *data, struct ast_str **buf, ssize_t len)
 {
 	return pp_each_extension_helper(chan, cmd, data, NULL, buf, len);
 }