[asterisk-commits] kpfleming: trunk r209760 - in /trunk: ./ channels/ channels/misdn/ main/ pbx/...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Fri Jul 31 20:03:07 2009
New Revision: 209760

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209760
Log:
Merged revisions 209759 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines
  
  Minor changes inspired by testing with latest GCC.
  
  The latest GCC (what will become 4.5.x) has a few new warnings, that in these
  cases found some either downright buggy code, or at least seriously poorly
  designed code that could be improved.
........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/channels/chan_dahdi.c
    trunk/channels/chan_misdn.c
    trunk/channels/misdn/ie.c
    trunk/main/Makefile
    trunk/pbx/pbx_config.c
    trunk/utils/frame.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/Makefile?view=diff&rev=209760&r1=209759&r2=209760
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Jul 31 20:03:07 2009
@@ -237,7 +237,7 @@
   _ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
   _ASTCFLAGS+=-Wundef 
   _ASTCFLAGS+=-Wmissing-format-attribute
-  _ASTCFLAGS+=-Wformat=2
+  _ASTCFLAGS+=-Wformat=2 -Wno-format-security
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=209760&r1=209759&r2=209760
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Jul 31 20:03:07 2009
@@ -2526,7 +2526,7 @@
 	old->dsp_features = 0;
 }
 
-static int sig_pri_tone_to_dahditone(enum analog_tone tone)
+static int sig_pri_tone_to_dahditone(enum sig_pri_tone tone)
 {
 	switch (tone) {
 	case SIG_PRI_TONE_RINGTONE:

Modified: trunk/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=209760&r1=209759&r2=209760
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Fri Jul 31 20:03:07 2009
@@ -11081,7 +11081,7 @@
 			error_str = misdn_no_response_from_network;
 		} else if (cc_record->reject_code != FacReject_None) {
 			error_str = misdn_to_str_reject_code(cc_record->reject_code);
-		} else if (cc_record->reject_code != FacError_None) {
+		} else if (cc_record->error_code != FacError_None) {
 			error_str = misdn_to_str_error_code(cc_record->error_code);
 		} else {
 			error_str = NULL;

Modified: trunk/channels/misdn/ie.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/misdn/ie.c?view=diff&rev=209760&r1=209759&r2=209760
==============================================================================
--- trunk/channels/misdn/ie.c (original)
+++ trunk/channels/misdn/ie.c Fri Jul 31 20:03:07 2009
@@ -247,7 +247,7 @@
 		if (p[0] <= octet)
 			goto done;
 
-		if (!p[octet++] & 0x80)
+		if (~p[octet++] & 0x80)
 			goto l2;
 
 		/* Wheee. V.110 speed information */

Modified: trunk/main/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/Makefile?view=diff&rev=209760&r1=209759&r2=209760
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Fri Jul 31 20:03:07 2009
@@ -98,7 +98,7 @@
 	$(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a: CHECK_SUBDIR
-	CFLAGS="$(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
+	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
 
 ast_expr2.c ast_expr2.h:
 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y

Modified: trunk/pbx/pbx_config.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/pbx/pbx_config.c?view=diff&rev=209760&r1=209759&r2=209760
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Fri Jul 31 20:03:07 2009
@@ -1440,7 +1440,7 @@
 					goto process_extension;
 				}
 			} else if (!strcasecmp(v->name, "exten")) {
-				int ipri = -2;
+				int ipri;
 				char *plus, *firstp;
 				char *pri, *appl, *data, *cidmatch;
 
@@ -1452,6 +1452,7 @@
 				pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1);
 				ast_copy_string(lastextension, realext, sizeof(lastextension));
 process_extension:
+				ipri = -2;
 				if ((cidmatch = strchr(realext, '/'))) {
 					*cidmatch++ = '\0';
 					ast_shrink_phone_number(cidmatch);

Modified: trunk/utils/frame.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/utils/frame.c?view=diff&rev=209760&r1=209759&r2=209760
==============================================================================
--- trunk/utils/frame.c (original)
+++ trunk/utils/frame.c Fri Jul 31 20:03:07 2009
@@ -744,7 +744,7 @@
 void parseargs( int argcount, char *args[], int fileswitch)
 {
    char *filename;
-   int tempint;
+   int tempint = 0;
 
    if ((fileswitch & 1) != 0)     /* If getting infile  */
      in = NULL;