From 00dd28909470bf982429dbf6304515ce1b1f33b2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 11 Apr 2006 23:06:48 +0000 Subject: automerge commit git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@19435 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_dial.c | 2 ++ apps/app_voicemail.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/app_dial.c b/apps/app_dial.c index c323480b2..a7597aa55 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -304,6 +304,8 @@ static void hanguptree(struct localuser *outgoing, struct ast_channel *exception ast_cdr_failed(chan->cdr); \ numnochan++; \ break; \ + case AST_CAUSE_NORMAL_CLEARING: \ + break; \ default: \ numnochan++; \ break; \ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 582595ad8..b925a9746 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1281,7 +1281,7 @@ static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int ms len = fdlen; /* SQL_LEN_DATA_AT_EXEC(fdlen); */ SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(dir), 0, (void *)dir, 0, NULL); SQLBindParameter(stmt, 2, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(msgnums), 0, (void *)msgnums, 0, NULL); - SQLBindParameter(stmt, 3, SQL_PARAM_INPUT, SQL_C_BINARY, SQL_BINARY, fdlen, 0, (void *)fdm, fdlen, &len); + SQLBindParameter(stmt, 3, SQL_PARAM_INPUT, SQL_C_BINARY, SQL_LONGVARBINARY, fdlen, 0, (void *)fdm, fdlen, &len); SQLBindParameter(stmt, 4, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(context), 0, (void *)context, 0, NULL); SQLBindParameter(stmt, 5, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(macrocontext), 0, (void *)macrocontext, 0, NULL); SQLBindParameter(stmt, 6, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(callerid), 0, (void *)callerid, 0, NULL); -- cgit v1.2.3