kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 231688 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r231688 | mnicholson | 2009-11-30 15:31:55 -0600 (Mon, 30 Nov 2009) | 15 lines
  
  Merged revisions 231614 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r231614 | mnicholson | 2009-11-30 15:11:44 -0600 (Mon, 30 Nov 2009) | 8 lines
    
    Remove duplicate entries from voicemail format lists. This prevents app_voicemail from entering an infinite loop when the same format is specified twice in the format list.
    
    (closes issue #15625)
    Reported by: Shagg63
    Tested by: mnicholson
    
    Review: https://reviewboard.asterisk.org/r/429/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@231691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-11-30 21:37:21 +00:00
parent 32152e49a5
commit f9fc028293
4 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/asterisk/file.h
View File

@@ -40,6 +40,9 @@ extern "C" {
struct ast_filestream;
struct ast_format;
/*! The maximum number of formats we expect to see in a format string */
#define AST_MAX_FORMATS 10
/*! Convenient for waiting */
#define AST_DIGIT_ANY "0123456789#*ABCD"
#define AST_DIGIT_ANYNUM "0123456789"
@@ -315,6 +318,14 @@ off_t ast_tellstream(struct ast_filestream *fs);
*/
struct ast_frame *ast_readframe(struct ast_filestream *s);
/*! Remove duplicate formats from a format string. */
/*!
* \param fmts a format string, this string will be modified
* \retval NULL error
* \return a pointer to the reduced format string, this is a pointer to fmts
*/
char *ast_format_str_reduce(char *fmts);
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif