[asterisk-commits] seanbright: trunk r302413 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jan 19 09:34:07 2011
New Revision: 302413

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302413
Log:
Merged revisions 302412 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302412 | seanbright | 2011-01-19 10:31:39 -0500 (Wed, 19 Jan 2011) | 10 lines
  
  Use appropriate type for requested format in chan_local.
  
  We were passing and storing the requested format as an int instead of format_t
  resulting in truncation.
  
  (closes issue #18238)
  Reported by: whizemen
  Patches:
        0018238_speex16.patch uploaded by whizemen (license 1143)
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

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

Modified: trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_local.c?view=diff&rev=302413&r1=302412&r2=302413
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Wed Jan 19 09:34:07 2011
@@ -141,7 +141,7 @@
 	unsigned int flags;                     /*!< Private flags */
 	char context[AST_MAX_CONTEXT];		/*!< Context to call */
 	char exten[AST_MAX_EXTENSION];		/*!< Extension to call */
-	int reqformat;				/*!< Requested format */
+	format_t reqformat;				/*!< Requested format */
 	struct ast_jb_conf jb_conf;		/*!< jitterbuffer configuration for this local channel */
 	struct ast_channel *owner;		/*!< Master Channel - Bridging happens here */
 	struct ast_channel *chan;		/*!< Outbound channel - PBX is run here */
@@ -955,7 +955,7 @@
 }
 
 /*! \brief Create a call structure */
-static struct local_pvt *local_alloc(const char *data, int format)
+static struct local_pvt *local_alloc(const char *data, format_t format)
 {
 	struct local_pvt *tmp = NULL;
 	char *c = NULL, *opts = NULL;