Merged revisions 233121 via svnmerge from

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

................
  r233121 | dvossel | 2009-12-04 11:22:31 -0600 (Fri, 04 Dec 2009) | 12 lines
  
  Merged revisions 233116 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r233116 | dvossel | 2009-12-04 11:21:34 -0600 (Fri, 04 Dec 2009) | 6 lines
    
    document and rename strip_control() in app_voicemail
    
    (closes issue #16291)
    Reported by: wdoekes
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@233167 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
David Vossel 16 years ago
parent 8041c006fd
commit f35d69a94c

@ -692,7 +692,13 @@ static int is_valid_dtmf(const char *key);
static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit);
#endif
static char *strip_control(const char *input, char *buf, size_t buflen)
/*!
* \brief Strips control and non 7-bit clean characters from input string.
*
* \note To map control and none 7-bit characters to a 7-bit clean characters
* please use ast_str_encode_mine().
*/
static char *strip_control_and_high(const char *input, char *buf, size_t buflen)
{
char *bufptr = buf;
for (; *input; input++) {
@ -3542,10 +3548,10 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
passdata2 = alloca(len_passdata2);
if (!ast_strlen_zero(cidnum)) {
strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum));
strip_control_and_high(cidnum, enc_cidnum, sizeof(enc_cidnum));
}
if (!ast_strlen_zero(cidname)) {
strip_control(cidname, enc_cidname, sizeof(enc_cidname));
strip_control_and_high(cidname, enc_cidname, sizeof(enc_cidname));
}
gethostname(host, sizeof(host) - 1);

Loading…
Cancel
Save