diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-14 18:41:48 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-14 18:41:48 +0000 |
commit | 929f74c99448a1e95494b8952e2fd33b7a99603d (patch) | |
tree | a763d61fde3e288474ba25a36c617c7ff697fd1f | |
parent | 661896e3dc9c3a6c67ca1363587fa3e183f5e1ad (diff) |
fix return values on systems where an unsigned char is the default (bug #4455)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-0@5908 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | app.c | 6 | ||||
-rwxr-xr-x | channel.c | 10 | ||||
-rwxr-xr-x | file.c | 6 | ||||
-rwxr-xr-x | include/asterisk/channel.h | 4 | ||||
-rwxr-xr-x | include/asterisk/file.h | 6 | ||||
-rwxr-xr-x | pbx.c | 2 |
6 files changed, 18 insertions, 16 deletions
@@ -520,7 +520,8 @@ static int global_maxsilence = 0; int ast_play_and_record(struct ast_channel *chan, char *playfile, char *recordfile, int maxtime, char *fmt, int *duration, int silencethreshold, int maxsilence, const char *path) { - char d, *fmts; + int d; + char *fmts; char comment[256]; int x, fmtcnt=1, res=-1,outmsg=0; struct ast_frame *f; @@ -736,7 +737,8 @@ int ast_play_and_record(struct ast_channel *chan, char *playfile, char *recordfi int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordfile, int maxtime, char *fmt, int *duration, int beep, int silencethreshold, int maxsilence) { - char d = 0, *fmts; + int d = 0; + char *fmts; char comment[256]; int x, fmtcnt=1, res=-1,outmsg=0; struct ast_frame *f; @@ -1089,11 +1089,11 @@ int ast_waitfor(struct ast_channel *c, int ms) return ms; } -char ast_waitfordigit(struct ast_channel *c, int ms) +int ast_waitfordigit(struct ast_channel *c, int ms) { /* XXX Should I be merged with waitfordigit_full XXX */ struct ast_frame *f; - char result = 0; + int result = 0; /* Stop if we're a zombie or need a soft hangup */ if (c->zombie || ast_check_hangup(c)) return -1; @@ -1133,7 +1133,7 @@ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), #endif return res; } -char ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd) +int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd) { struct ast_frame *f; struct ast_channel *rchan; @@ -2013,7 +2013,7 @@ int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int fti { int pos=0; int to = ftimeout; - char d; + int d; /* XXX Merge with full version? XXX */ /* Stop if we're a zombie or need a soft hangup */ if (c->zombie || ast_check_hangup(c)) @@ -2052,7 +2052,7 @@ int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, in { int pos=0; int to = ftimeout; - char d; + int d; /* Stop if we're a zombie or need a soft hangup */ if (c->zombie || ast_check_hangup(c)) return -1; @@ -932,7 +932,7 @@ struct ast_filestream *ast_writefile(char *filename, char *type, char *comment, return fs; } -char ast_waitstream(struct ast_channel *c, char *breakon) +int ast_waitstream(struct ast_channel *c, char *breakon) { /* XXX Maybe I should just front-end ast_waitstream_full ? XXX */ int res; @@ -988,7 +988,7 @@ char ast_waitstream(struct ast_channel *c, char *breakon) return (c->_softhangup ? -1 : 0); } -char ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind, int ms) +int ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind, int ms) { int res; struct ast_frame *fr; @@ -1057,7 +1057,7 @@ char ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char return (c->_softhangup ? -1 : 0); } -char ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int cmdfd) +int ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int cmdfd) { int res; int ms; diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 516e3a9a8..f99831d38 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -643,11 +643,11 @@ struct ast_channel *ast_get_channel_by_name_locked(char *channame); * \param c channel to wait for a digit on * \param ms how many milliseconds to wait * Wait for a digit. Returns <0 on error, 0 on no entry, and the digit on success. */ -char ast_waitfordigit(struct ast_channel *c, int ms); +int ast_waitfordigit(struct ast_channel *c, int ms); /* Same as above with audio fd for outputing read audio and ctrlfd to monitor for reading. Returns 1 if ctrlfd becomes available */ -char ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int ctrlfd); +int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int ctrlfd); //! Reads multiple digits /*! diff --git a/include/asterisk/file.h b/include/asterisk/file.h index 074518552..dadd59b0b 100755 --- a/include/asterisk/file.h +++ b/include/asterisk/file.h @@ -121,7 +121,7 @@ int ast_filecopy(char *oldname, char *newname, char *fmt); * Wait for a stream to stop or for any one of a given digit to arrive, Returns 0 * if the stream finishes, the character if it was interrupted, and -1 on error */ -char ast_waitstream(struct ast_channel *c, char *breakon); +int ast_waitstream(struct ast_channel *c, char *breakon); //! Same as waitstream but allows stream to be forwarded or rewound /*! @@ -134,11 +134,11 @@ char ast_waitstream(struct ast_channel *c, char *breakon); * Wait for a stream to stop or for any one of a given digit to arrive, Returns 0 * if the stream finishes, the character if it was interrupted, and -1 on error */ -char ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind, int ms); +int ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind, int ms); /* Same as waitstream, but with audio output to fd and monitored fd checking. Returns 1 if monfd is ready for reading */ -char ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int monfd); +int ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int monfd); //! Starts reading from a file /*! @@ -1775,7 +1775,7 @@ int ast_spawn_extension(struct ast_channel *c, char *context, char *exten, int p int ast_pbx_run(struct ast_channel *c) { int firstpass = 1; - char digit; + int digit; char exten[256]; int pos; int waittime; |