kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace changes only

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-07-10 17:42:12 +00:00
parent 0e0059c0f3
commit 4a3e227291
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app.c
View File

@@ -99,8 +99,6 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
return res; return res;
} }
/*! \param timeout set timeout to 0 for "standard" timeouts. Set timeout to -1 for /*! \param timeout set timeout to 0 for "standard" timeouts. Set timeout to -1 for
"ludicrous time" (essentially never times out) */ "ludicrous time" (essentially never times out) */
int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout) int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout)
@@ -555,10 +553,9 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "x=%d, open writing: %s format: %s, %p\n", x, prepend ? prependfile : recordfile, sfmt[x], others[x]); ast_verbose(VERBOSE_PREFIX_3 "x=%d, open writing: %s format: %s, %p\n", x, prepend ? prependfile : recordfile, sfmt[x], others[x]);
if (!others[x]) { if (!others[x])
break; break;
} }
}
if (path) if (path)
ast_unlock_path(path); ast_unlock_path(path);
@@ -925,7 +922,7 @@ enum AST_LOCK_RESULT ast_lock_path(const char *path)
snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random()); snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random());
fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600); fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Unable to create lock file '%s': %s\n", path, strerror(errno)); ast_log(LOG_ERROR, "Unable to create lock file '%s': %s\n", path, strerror(errno));
return AST_LOCK_PATH_NOT_FOUND; return AST_LOCK_PATH_NOT_FOUND;
} }
close(fd); close(fd);
@@ -1056,6 +1053,7 @@ int ast_record_review(struct ast_channel *chan, const char *playfile, const char
#define RES_RESTART ((1 << 19) | RES_REPEAT) #define RES_RESTART ((1 << 19) | RES_REPEAT)
static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata); static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata);
static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option, char *exten, void *cbdata) static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option, char *exten, void *cbdata)
{ {
int res; int res;
@@ -1242,12 +1240,9 @@ static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_me
int ast_ivr_menu_run(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata) int ast_ivr_menu_run(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata)
{ {
int res; int res = ast_ivr_menu_run_internal(chan, menu, cbdata);
res = ast_ivr_menu_run_internal(chan, menu, cbdata);
/* Hide internal coding */ /* Hide internal coding */
if (res > 0) return res > 0 ? 0 : res;
res = 0;
return res;
} }
char *ast_read_textfile(const char *filename) char *ast_read_textfile(const char *filename)
@@ -1318,3 +1313,4 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
return res; return res;
} }