[svn-commits] branch rizzo/base r10337 - in /team/rizzo/base: apps/ include/asterisk/

[svn-commits at lists.digium.com]

Author: rizzo
Date: Thu Feb 16 15:36:28 2006
New Revision: 10337

URL: http://svn.digium.com/view/asterisk?rev=10337&view=rev
Log:
prepare for merge


Modified:
    team/rizzo/base/apps/app_alarmreceiver.c
    team/rizzo/base/apps/app_voicemail.c
    team/rizzo/base/include/asterisk/linkedlists.h

Modified: team/rizzo/base/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_alarmreceiver.c?rev=10337&r1=10336&r2=10337&view=diff
==============================================================================
--- team/rizzo/base/apps/app_alarmreceiver.c (original)
+++ team/rizzo/base/apps/app_alarmreceiver.c Thu Feb 16 15:36:28 2006
@@ -95,10 +95,8 @@
 static char db_family[128] = {'\0'};
 static char time_stamp_format[128] = {"%a %b %d, %Y @ %H:%M:%S %Z"};
 
-
 /* Misc variables */
 
-	
 static char event_file[14] = "/event-XXXXXX";
 
 LOCAL_USER_DECL;

Modified: team/rizzo/base/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_voicemail.c?rev=10337&r1=10336&r2=10337&view=diff
==============================================================================
--- team/rizzo/base/apps/app_voicemail.c (original)
+++ team/rizzo/base/apps/app_voicemail.c Thu Feb 16 15:36:28 2006
@@ -3353,7 +3353,7 @@
 	char ext_context[256]="";
 	int res = 0, cmd = 0;
 	struct ast_vm_user *receiver = NULL, *vmtmp;
-	AST_LIST_HEAD_NOLOCK(extension, ast_vm_user) extensions;
+	AST_LIST_HEAD_NOLOCK_STATIC(extensions, ast_vm_user);
 	char tmp[256];
 	char *stringp, *s;
 	int saved_messages = 0, found = 0;

Modified: team/rizzo/base/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/include/asterisk/linkedlists.h?rev=10337&r1=10336&r2=10337&view=diff
==============================================================================
--- team/rizzo/base/include/asterisk/linkedlists.h (original)
+++ team/rizzo/base/include/asterisk/linkedlists.h Thu Feb 16 15:36:28 2006
@@ -128,7 +128,7 @@
 	.first = NULL,							\
 	.last = NULL,							\
 	.lock = AST_MUTEX_INIT_VALUE,					\
-};
+}
 
 /*!
   \brief Defines a structure to be used to hold a list of specified type, statically initialized.
@@ -142,7 +142,7 @@
 } name = {								\
 	.first = NULL,							\
 	.last = NULL,							\
-};
+}
 
 /*!
   \brief Initializes a list head structure with a specified first entry.