[svn-commits] dvossel: trunk r271341 - /trunk/main/file.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri Jun 18 13:59:05 2010
New Revision: 271341

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=271341
Log:
file.c was truncating audio file formats to the lower 32bits.

Modified:
    trunk/main/file.c

Modified: trunk/main/file.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/file.c?view=diff&rev=271341&r1=271340&r2=271341
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Fri Jun 18 13:59:05 2010
@@ -406,10 +406,10 @@
  * if fmt is NULL, OPEN will return the first matching entry,
  * whereas other functions will run on all matching entries.
  */
-static int ast_filehelper(const char *filename, const void *arg2, const char *fmt, const enum file_action action)
+static format_t ast_filehelper(const char *filename, const void *arg2, const char *fmt, const enum file_action action)
 {
 	struct ast_format *f;
-	int res = (action == ACTION_EXISTS) ? 0 : -1;
+	format_t res = (action == ACTION_EXISTS) ? 0 : -1;
 
 	AST_RWLIST_RDLOCK(&formats);
 	/* Check for a specific format */
@@ -529,7 +529,7 @@
 	return filename[0] == '/';
 }
 
-static int fileexists_test(const char *filename, const char *fmt, const char *lang,
+static format_t fileexists_test(const char *filename, const char *fmt, const char *lang,
 			   char *buf, int buflen)
 {
 	if (buf == NULL) {
@@ -563,10 +563,10 @@
  * The last parameter(s) point to a buffer of sufficient size,
  * which on success is filled with the matching filename.
  */
-static int fileexists_core(const char *filename, const char *fmt, const char *preflang,
+static format_t fileexists_core(const char *filename, const char *fmt, const char *preflang,
 			   char *buf, int buflen)
 {
-	int res = -1;
+	format_t res = -1;
 	char *lang;
 
 	if (buf == NULL) {
@@ -625,7 +625,8 @@
 	 * language and format, set up a suitable translator,
 	 * and open the stream.
 	 */
-	int fmts, res, buflen;
+	format_t fmts, res;
+	int buflen;
 	char *buf;
 
 	if (!asis) {