[asterisk-commits] mogorman: branch anthonyl/voicemail-odbc r49350 -
/team/anthonyl/voicemail-od...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Jan 3 15:36:46 MST 2007
Author: mogorman
Date: Wed Jan 3 16:36:46 2007
New Revision: 49350
URL: http://svn.digium.com/view/asterisk?view=rev&rev=49350
Log:
White space fixes, before merge.
Modified:
team/anthonyl/voicemail-odbc/apps/app_voicemail.c
Modified: team/anthonyl/voicemail-odbc/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/voicemail-odbc/apps/app_voicemail.c?view=diff&rev=49350&r1=49349&r2=49350
==============================================================================
--- team/anthonyl/voicemail-odbc/apps/app_voicemail.c (original)
+++ team/anthonyl/voicemail-odbc/apps/app_voicemail.c Wed Jan 3 16:36:46 2007
@@ -1806,7 +1806,7 @@
fclose(p);
snprintf(tmp2, sizeof(tmp2), "( %s < %s ; rm -f %s ) &", mailcmd, tmp, tmp);
ast_safe_system(tmp2);
- ast_log(LOG_DEBUG, "Sent mail to %s with command '%s'\n", vmu->email, mailcmd);
+ ast_log(LOG_DEBUG, "Sent mail to %s with command '%s'\n", vmu->email, mailcmd);
} else {
ast_log(LOG_WARNING, "Unable to launch '%s'\n", mailcmd);
return -1;
@@ -1938,19 +1938,20 @@
localtime_r(&t,&tm);
return strftime(s, len, "%a %b %e %r %Z %Y", &tm);
}
-
+
static int invent_message(struct ast_channel *chan, char *context, char *ext, int busy, char *ecodes)
{
int res;
char fn[256];
char dest[1024];
-
+
snprintf(fn, sizeof(fn), "%s%s/%s/greet", VM_SPOOL_DIR, context, ext);
-
- if (!(res=create_dirpath(&dest,1024,context,ext,"greet"))) {
- ast_log(LOG_WARNING, "Failed to make directory(%s)\n", fn);
- return -1;
- }
+
+ if (!(res = create_dirpath(&dest,1024,context,ext,"greet"))) {
+ ast_log(LOG_WARNING, "Failed to make directory(%s)\n", fn);
+ return -1;
+ }
+
RETRIEVE(fn, -1);
if (ast_fileexists(fn, NULL, NULL) > 0) {
res = ast_streamfile(chan, fn, chan->language);
@@ -2442,17 +2443,16 @@
else
ast_copy_string(ext_context, vmu->context, sizeof(ext_context));
if (ast_test_flag(options, OPT_BUSY_GREETING)) {
- res = create_dirpath(&dest, 1024, vmu->context, ext, "busy");
+ res = create_dirpath(&dest, 1024, vmu->context, ext, "busy");
snprintf(prefile, sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, ext);
- }
- else if (ast_test_flag(options, OPT_UNAVAIL_GREETING)) {
- res = create_dirpath(&dest, 1024, vmu->context, ext, "unavail");
+ } else if (ast_test_flag(options, OPT_UNAVAIL_GREETING)) {
+ res = create_dirpath(&dest, 1024, vmu->context, ext, "unavail");
snprintf(prefile, sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, ext);
}
snprintf(tempfile, sizeof(tempfile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, ext);
if (!(res=create_dirpath(&dest, 1024, vmu->context, ext, "temp"))) {
- ast_log(LOG_WARNING, "Failed to make directory (%s)\n", tempfile);
- return -1;
+ ast_log(LOG_WARNING, "Failed to make directory (%s)\n", tempfile);
+ return -1;
}
RETRIEVE(tempfile, -1);
if (ast_fileexists(tempfile, NULL, NULL) > 0)
@@ -3801,7 +3801,7 @@
static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms)
{
- int res = 0;
+ int res = 0;
char filename[256],*origtime, *cid, *context, *duration;
char *category;
struct ast_config *msg_cfg;
@@ -4803,7 +4803,7 @@
static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain)
{
- int res;
+ int res;
int cmd = 0;
int retries = 0;
int duration = 0;
@@ -4822,9 +4822,9 @@
adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DISPLAY);
}
snprintf(prefile,sizeof(prefile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, vms->username);
- if (!(res=create_dirpath(&dest, 1024, vmu->context, vms->username, "temp"))) {
- ast_log(LOG_WARNING, "Failed to create directory (%s).\n", prefile);
- return -1;
+ if (!(res = create_dirpath(&dest, 1024, vmu->context, vms->username, "temp"))) {
+ ast_log(LOG_WARNING, "Failed to create directory (%s).\n", prefile);
+ return -1;
}
while((cmd >= 0) && (cmd != 't')) {
if (cmd)
More information about the asterisk-commits
mailing list