[svn-commits] file: branch file/gulp_new_invite r395185 - in /team/file/gulp_new_invite: ./...

[SVN commits to the Digium repositories]

Author: file
Date: Tue Jul 23 13:42:07 2013
New Revision: 395185

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395185
Log:
Multiple revisions 395182-395183

........
  r395182 | rmudgett | 2013-07-23 15:41:18 -0300 (Tue, 23 Jul 2013) | 1 line
  
  Reinclude sys/stat.h in chan_dahdi.c and remove redundant include in utils.c
........
  r395183 | file | 2013-07-23 15:41:29 -0300 (Tue, 23 Jul 2013) | 2 lines
  
  Drop the reference count on the correct object.
........

Merged revisions 395182-395183 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/file/gulp_new_invite/   (props changed)
    team/file/gulp_new_invite/channels/chan_dahdi.c
    team/file/gulp_new_invite/channels/chan_gulp.c
    team/file/gulp_new_invite/main/utils.c

Propchange: team/file/gulp_new_invite/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 23 13:42:07 2013
@@ -1,1 +1,1 @@
-/trunk:1-395178
+/trunk:1-395184

Modified: team/file/gulp_new_invite/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/file/gulp_new_invite/channels/chan_dahdi.c?view=diff&rev=395185&r1=395184&r2=395185
==============================================================================
--- team/file/gulp_new_invite/channels/chan_dahdi.c (original)
+++ team/file/gulp_new_invite/channels/chan_dahdi.c Tue Jul 23 13:42:07 2013
@@ -62,6 +62,7 @@
 #else
 #include <sys/signal.h>
 #endif
+#include <sys/stat.h>
 #include <math.h>
 
 #include "sig_analog.h"

Modified: team/file/gulp_new_invite/channels/chan_gulp.c
URL: http://svnview.digium.com/svn/asterisk/team/file/gulp_new_invite/channels/chan_gulp.c?view=diff&rev=395185&r1=395184&r2=395185
==============================================================================
--- team/file/gulp_new_invite/channels/chan_gulp.c (original)
+++ team/file/gulp_new_invite/channels/chan_gulp.c Tue Jul 23 13:42:07 2013
@@ -1510,7 +1510,7 @@
 	}
 
 	clear_session_and_channel(session, ast, pvt);
-	ao2_cleanup(pvt);
+	ao2_cleanup(channel);
 	ao2_cleanup(h_data);
 
 	return 0;
@@ -1540,7 +1540,7 @@
 	 * to be able to send our SIP request/response
 	 */
 	clear_session_and_channel(channel->session, ast, pvt);
-	ao2_cleanup(pvt);
+	ao2_cleanup(channel);
 	ao2_cleanup(h_data);
 
 	return -1;

Modified: team/file/gulp_new_invite/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/team/file/gulp_new_invite/main/utils.c?view=diff&rev=395185&r1=395184&r2=395185
==============================================================================
--- team/file/gulp_new_invite/main/utils.c (original)
+++ team/file/gulp_new_invite/main/utils.c Tue Jul 23 13:42:07 2013
@@ -33,7 +33,6 @@
 
 #include <ctype.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <unistd.h>