Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv12114/include/asterisk
Modified Files:
Tag: v1-0
channel.h file.h
Log Message:
fix return values on systems where an unsigned char is the default (bug #4455)
Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -u -d -r1.55.2.1 -r1.55.2.2
--- channel.h 8 Nov 2004 00:08:58 -0000 1.55.2.1
+++ channel.h 14 Jun 2005 18:41:48 -0000 1.55.2.2
@@ -643,11 +643,11 @@
* \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
/*!
Index: file.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/file.h,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -d -r1.17.2.2 -r1.17.2.3
--- file.h 14 Feb 2005 03:06:37 -0000 1.17.2.2
+++ file.h 14 Jun 2005 18:41:48 -0000 1.17.2.3
@@ -121,7 +121,7 @@
* 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 @@
* 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
/*!
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
