[svn-commits] branch bweschke/gain_functions r14517 - in /team/bweschke/gain_functions: ./ ...

[svn-commits at lists.digium.com]

Author: bweschke
Date: Thu Mar 23 15:09:06 2006
New Revision: 14517

URL: http://svn.digium.com/view/asterisk?rev=14517&view=rev
Log:
Merged revisions 14463,14470,14479,14508 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r14463 | russell | 2006-03-23 14:15:01 -0600 (Thu, 23 Mar 2006) | 10 lines

Merged revisions 14462 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r14462 | russell | 2006-03-23 15:13:48 -0500 (Thu, 23 Mar 2006) | 2 lines

don't crash when asked to read from a file that doesn't exist (issue #6786)

........

................
r14470 | bweschke | 2006-03-23 14:48:08 -0600 (Thu, 23 Mar 2006) | 11 lines

Merged revisions 14467 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r14467 | bweschke | 2006-03-23 14:43:05 -0600 (Thu, 23 Mar 2006) | 3 lines

 Bug #5884 - fix a possible race state in app_meetme when a channel has gone away and we are reading continuously for more frames. (mneuhauser)


........

................
r14479 | kpfleming | 2006-03-23 15:01:19 -0600 (Thu, 23 Mar 2006) | 2 lines

don't wrap this in ifdef... using va_start is safe on all platforms :-)

................
r14508 | kpfleming | 2006-03-23 15:06:26 -0600 (Thu, 23 Mar 2006) | 2 lines

correct typo

................

Modified:
    team/bweschke/gain_functions/   (props changed)
    team/bweschke/gain_functions/apps/app_meetme.c
    team/bweschke/gain_functions/apps/app_readfile.c
    team/bweschke/gain_functions/pbx.c
    team/bweschke/gain_functions/utils.c

Propchange: team/bweschke/gain_functions/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/bweschke/gain_functions/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 23 15:09:06 2006
@@ -1,1 +1,1 @@
-/trunk:1-14427
+/trunk:1-14516

Modified: team/bweschke/gain_functions/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/gain_functions/apps/app_meetme.c?rev=14517&r1=14516&r2=14517&view=diff
==============================================================================
--- team/bweschke/gain_functions/apps/app_meetme.c (original)
+++ team/bweschke/gain_functions/apps/app_meetme.c Thu Mar 23 15:09:06 2006
@@ -779,6 +779,8 @@
 			f = ast_read(chan);
 			if (f)
 				ast_frfree(f);
+			else /* channel was hung up or something else happened */
+				break;
 		}
 	}
 

Modified: team/bweschke/gain_functions/apps/app_readfile.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/gain_functions/apps/app_readfile.c?rev=14517&r1=14516&r2=14517&view=diff
==============================================================================
--- team/bweschke/gain_functions/apps/app_readfile.c (original)
+++ team/bweschke/gain_functions/apps/app_readfile.c Thu Mar 23 15:09:06 2006
@@ -92,15 +92,16 @@
 		}
 	}
 
-	returnvar = ast_read_textfile(file);
-	if(len > 0){
-		if(len < strlen(returnvar))
-			returnvar[len]='\0';
-		else
-			ast_log(LOG_WARNING,"%s is longer than %d, and %d \n", file, len, (int)strlen(returnvar));
+	if ((returnvar = ast_read_textfile(file))) {
+		if (len > 0) {
+			if (len < strlen(returnvar))
+				returnvar[len]='\0';
+			else
+				ast_log(LOG_WARNING, "%s is longer than %d, and %d \n", file, len, (int)strlen(returnvar));
+		}
+		pbx_builtin_setvar_helper(chan, varname, returnvar);
+		free(returnvar);
 	}
-	pbx_builtin_setvar_helper(chan, varname, returnvar);
-	free(returnvar);
 	LOCAL_USER_REMOVE(u);
 	return res;
 }

Modified: team/bweschke/gain_functions/pbx.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/gain_functions/pbx.c?rev=14517&r1=14516&r2=14517&view=diff
==============================================================================
--- team/bweschke/gain_functions/pbx.c (original)
+++ team/bweschke/gain_functions/pbx.c Thu Mar 23 15:09:06 2006
@@ -3439,7 +3439,7 @@
 		return RESULT_SHOWUSAGE;
 
 	pbx_builtin_setvar_helper(NULL, argv[2], argv[3]);
-	ast_cli(fd, "\n    -- Global variables %s set to %s\n", argv[2], argv[3]);
+	ast_cli(fd, "\n    -- Global variable %s set to %s\n", argv[2], argv[3]);
 
 	return RESULT_SUCCESS;
 }

Modified: team/bweschke/gain_functions/utils.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/gain_functions/utils.c?rev=14517&r1=14516&r2=14517&view=diff
==============================================================================
--- team/bweschke/gain_functions/utils.c (original)
+++ team/bweschke/gain_functions/utils.c Thu Mar 23 15:09:06 2006
@@ -1024,11 +1024,7 @@
 	va_list ap1, ap2;
 
 	va_start(ap1, format);
-#if defined(__FreeBSD__)
 	va_start(ap2, format);		/* va_copy does not exist on FreeBSD */
-#else
-	va_copy(ap2, ap1);
-#endif
 
 	needed = vsnprintf(mgr->pool->base + mgr->used, mgr->space, format, ap1) + 1;