[svn-commits] markster: branch markster/usersconf r40829 - in /team/markster/usersconf: ./ ...

[svn-commits at lists.digium.com]

Author: markster
Date: Mon Aug 21 23:38:02 2006
New Revision: 40829

URL: http://svn.digium.com/view/asterisk?rev=40829&view=rev
Log:
Merged revisions 40812,40815,40818-40820,40826 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r40812 | file | 2006-08-21 20:01:39 -0500 (Mon, 21 Aug 2006) | 2 lines

Fix up the props a bit

................
r40815 | file | 2006-08-21 20:57:40 -0500 (Mon, 21 Aug 2006) | 2 lines

Sorry, but this does not resemble malloc... so GCC was ignoring the attribute and throwing a warning.

................
r40818 | file | 2006-08-21 21:15:34 -0500 (Mon, 21 Aug 2006) | 2 lines

Make doxygen work with the new location of files that now reside in main

................
r40819 | file | 2006-08-21 21:24:46 -0500 (Mon, 21 Aug 2006) | 2 lines

Make a warning about an unused function & variable go away on the stand alone AEL build.

................
r40820 | file | 2006-08-21 21:30:38 -0500 (Mon, 21 Aug 2006) | 2 lines

Another compile time warning bites the dust

................
r40826 | tilghman | 2006-08-21 22:01:49 -0500 (Mon, 21 Aug 2006) | 9 lines

Blocked revisions 40821 via svnmerge

........
r40821 | tilghman | 2006-08-21 21:59:37 -0500 (Mon, 21 Aug 2006) | 2 lines

Bug 7779 - Using initstate(3) means that we cannot unload this module once loaded.

........

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

Modified:
    team/markster/usersconf/   (props changed)
    team/markster/usersconf/contrib/asterisk-ng-doxygen
    team/markster/usersconf/include/asterisk/utils.h
    team/markster/usersconf/pbx/pbx_ael.c
    team/markster/usersconf/utils/muted.c

Propchange: team/markster/usersconf/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/markster/usersconf/
            ('svnmerge-integrated' removed)

Modified: team/markster/usersconf/contrib/asterisk-ng-doxygen
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/contrib/asterisk-ng-doxygen?rev=40829&r1=40828&r2=40829&view=diff
==============================================================================
--- team/markster/usersconf/contrib/asterisk-ng-doxygen (original)
+++ team/markster/usersconf/contrib/asterisk-ng-doxygen Mon Aug 21 23:38:02 2006
@@ -446,11 +446,12 @@
 # with spaces.
 
 INPUT                  = ./ \
+			 main \
 			 include \
                          include/asterisk \
 			 channels \
 			 funcs \
-			 stdtime \
+			 main/stdtime \
 			 apps \
 			 cdr \
 			 codecs \

Modified: team/markster/usersconf/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/include/asterisk/utils.h?rev=40829&r1=40828&r2=40829&view=diff
==============================================================================
--- team/markster/usersconf/include/asterisk/utils.h (original)
+++ team/markster/usersconf/include/asterisk/utils.h Mon Aug 21 23:38:02 2006
@@ -433,7 +433,7 @@
 	_ast_asprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, __VA_ARGS__)
 
 AST_INLINE_API(
-int attribute_malloc _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...),
+int _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...),
 {
 	int res;
 	va_list ap;
@@ -459,7 +459,7 @@
 	_ast_vasprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, (fmt), (ap))
 
 AST_INLINE_API(
-int attribute_malloc _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap),
+int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap),
 {
 	int res;
 

Modified: team/markster/usersconf/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/pbx/pbx_ael.c?rev=40829&r1=40828&r2=40829&view=diff
==============================================================================
--- team/markster/usersconf/pbx/pbx_ael.c (original)
+++ team/markster/usersconf/pbx/pbx_ael.c Mon Aug 21 23:38:02 2006
@@ -59,7 +59,10 @@
 static char *config = "extensions.ael";
 static char *registrar = "pbx_ael";
 
-static int errs, warns, notes;
+static int errs, warns;
+#ifndef STANDALONE_AEL
+static int notes;
+#endif
 
 #ifndef AAL_ARGCHECK
 /* for the time being, short circuit all the AAL related structures
@@ -2089,6 +2092,7 @@
 #endif
 }
 
+#ifndef STANDALONE_AEL
 static void check_context_names(void)
 {
 	pval *i,*j;
@@ -2107,6 +2111,7 @@
 		}
 	}
 }
+#endif
 
 static void check_abstract_reference(pval *abstract_context)
 {

Modified: team/markster/usersconf/utils/muted.c
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/utils/muted.c?rev=40829&r1=40828&r2=40829&view=diff
==============================================================================
--- team/markster/usersconf/utils/muted.c (original)
+++ team/markster/usersconf/utils/muted.c Mon Aug 21 23:38:02 2006
@@ -223,7 +223,7 @@
 	sin.sin_family = AF_INET;
 	sin.sin_port = htons(port);
 	memcpy(&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));
-	if (connect(sock, &sin, sizeof(sin))) {
+	if (connect(sock, (struct sockaddr *)&sin, sizeof(sin))) {
 		fprintf(stderr, "Failed to connect to '%s' port '%d': %s\n", host, port, strerror(errno));
 		close(sock);
 		return -1;