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

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri May 22 12:18:59 2009
New Revision: 196283

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196283
Log:
sync with trunk

Modified:
    team/jpeeler/asterisk-sigwork-trunk/   (props changed)
    team/jpeeler/asterisk-sigwork-trunk/channels/chan_sip.c
    team/jpeeler/asterisk-sigwork-trunk/main/astmm.c
    team/jpeeler/asterisk-sigwork-trunk/res/res_agi.c

Propchange: team/jpeeler/asterisk-sigwork-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 22 12:18:59 2009
@@ -1,1 +1,1 @@
-/trunk:1-196249
+/trunk:1-196276

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/chan_sip.c?view=diff&rev=196283&r1=196282&r2=196283
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/chan_sip.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/chan_sip.c Fri May 22 12:18:59 2009
@@ -20350,7 +20350,7 @@
 			}
 		} else {
 			/* Notify the first other party that they are connected to someone else assuming that target.chan1
-			   has progressed far enough through the dialplan to have it's called party information set. */
+			   has progressed far enough through the dialplan to have its called party information set. */
 			if (current->chan2) {
 				ast_channel_lock(target.chan1);
 				ast_party_connected_line_copy(&connected_caller, &target.chan1->connected);

Modified: team/jpeeler/asterisk-sigwork-trunk/main/astmm.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/main/astmm.c?view=diff&rev=196283&r1=196282&r2=196283
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/main/astmm.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/main/astmm.c Fri May 22 12:18:59 2009
@@ -324,7 +324,7 @@
 
 static char *handle_memory_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-	char *fn = NULL;
+	const char *fn = NULL;
 	struct ast_region *reg;
 	unsigned int x;
 	unsigned int len = 0;
@@ -386,7 +386,7 @@
 
 static char *handle_memory_show_summary(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-	char *fn = NULL;
+	const char *fn = NULL;
 	int x;
 	struct ast_region *reg;
 	unsigned int len = 0;

Modified: team/jpeeler/asterisk-sigwork-trunk/res/res_agi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/res/res_agi.c?view=diff&rev=196283&r1=196282&r2=196283
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/res/res_agi.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/res/res_agi.c Fri May 22 12:18:59 2009
@@ -3199,9 +3199,9 @@
 		fprintf(htmlfile, "<TR><TH ALIGN=\"CENTER\"><B>%s - %s</B></TH></TR>\n", fullcmd, command->summary);
 #ifdef AST_XML_DOCS
 		stringptmp = ast_xmldoc_printable(command->usage, 0);
-		stringp = stringptmp;
+		stringp = ast_strdup(stringptmp);
 #else
-		stringp = command->usage;
+		stringp = ast_strdup(command->usage);
 #endif
 		tempstr = strsep(&stringp, "\n");
 
@@ -3216,6 +3216,7 @@
 		}
 		fprintf(htmlfile, "</TD></TR>\n");
 		fprintf(htmlfile, "</TABLE></TD></TR>\n\n");
+		ast_free(stringp);
 #ifdef AST_XML_DOCS
 		ast_free(stringptmp);
 #endif