[asterisk-commits] branch oej/multiparking r12869 - in /team/oej/multiparking: ./ apps/ res/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Mar 14 02:12:21 2006
New Revision: 12869

URL: http://svn.digium.com/view/asterisk?rev=12869&view=rev
Log:
Resolve conflict, reset automerge

Modified:
    team/oej/multiparking/   (props changed)
    team/oej/multiparking/apps/app_voicemail.c
    team/oej/multiparking/res/res_features.c
    team/oej/multiparking/res/res_musiconhold.c

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 14 02:12:21 2006
@@ -1,1 +1,1 @@
-/trunk:1-12810
+/trunk:1-12868

Modified: team/oej/multiparking/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/apps/app_voicemail.c?rev=12869&r1=12868&r2=12869&view=diff
==============================================================================
--- team/oej/multiparking/apps/app_voicemail.c (original)
+++ team/oej/multiparking/apps/app_voicemail.c Tue Mar 14 02:12:21 2006
@@ -2207,10 +2207,9 @@
 	DIR *dir;
 	struct dirent *de;
 	char fn[256];
-	char tmp[256]="";
-	char *mb, *cur;
+	char tmp[256];
 	char *context;
-	int ret;
+
 	if (newmsgs)
 		*newmsgs = 0;
 	if (oldmsgs)
@@ -2220,9 +2219,10 @@
 		return 0;
 	if (strchr(mailbox, ',')) {
 		int tmpnew, tmpold;
+		char *mb, *cur;
+
 		ast_copy_string(tmp, mailbox, sizeof(tmp));
 		mb = tmp;
-		ret = 0;
 		while((cur = strsep(&mb, ", "))) {
 			if (!ast_strlen_zero(cur)) {
 				if (messagecount(cur, newmsgs ? &tmpnew : NULL, oldmsgs ? &tmpold : NULL))

Modified: team/oej/multiparking/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/res/res_features.c?rev=12869&r1=12868&r2=12869&view=diff
==============================================================================
--- team/oej/multiparking/res/res_features.c (original)
+++ team/oej/multiparking/res/res_features.c Tue Mar 14 02:12:21 2006
@@ -1533,7 +1533,7 @@
 	return res;
 }
 
-/*--- do_parking_thred: Take care of parked calls and unpark them if needed */
+/*! \brief Take care of parked calls and unpark them if needed */
 static void *do_parking_thread(void *ignore)
 {
 	int ms, tms, max;

Modified: team/oej/multiparking/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/res/res_musiconhold.c?rev=12869&r1=12868&r2=12869&view=diff
==============================================================================
--- team/oej/multiparking/res/res_musiconhold.c (original)
+++ team/oej/multiparking/res/res_musiconhold.c Tue Mar 14 02:12:21 2006
@@ -950,7 +950,7 @@
 						class->format = AST_FORMAT_SLINEAR;
 					}
 				}
-					var = var->next;
+				var = var->next;
 			}
 
 			if (ast_strlen_zero(class->dir)) {