[Asterisk-cvs] asterisk app.c, 1.31.2.2, 1.31.2.3 channel.c, 1.139.2.9, 1.139.2.10 file.c, 1.51.2.4, 1.51.2.5 pbx.c, 1.154.2.11, 1.154.2.12

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv12114

Modified Files:
      Tag: v1-0
	app.c channel.c file.c pbx.c 
Log Message:
fix return values on systems where an unsigned char is the default (bug #4455)


Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
diff -u -d -r1.31.2.2 -r1.31.2.3
--- app.c	29 Jan 2005 06:53:33 -0000	1.31.2.2
+++ app.c	14 Jun 2005 18:41:48 -0000	1.31.2.3
@@ -520,7 +520,8 @@
 
 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_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;

Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.139.2.9
retrieving revision 1.139.2.10
diff -u -d -r1.139.2.9 -r1.139.2.10
--- channel.c	16 May 2005 03:10:20 -0000	1.139.2.9
+++ channel.c	14 Jun 2005 18:41:48 -0000	1.139.2.10
@@ -1089,11 +1089,11 @@
 	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 @@
 #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 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 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;

Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.51.2.4
retrieving revision 1.51.2.5
diff -u -d -r1.51.2.4 -r1.51.2.5
--- file.c	31 May 2005 03:36:45 -0000	1.51.2.4
+++ file.c	14 Jun 2005 18:41:48 -0000	1.51.2.5
@@ -932,7 +932,7 @@
 	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 @@
 	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 @@
 	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;

Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.154.2.11
retrieving revision 1.154.2.12
diff -u -d -r1.154.2.11 -r1.154.2.12
--- pbx.c	15 May 2005 23:26:29 -0000	1.154.2.11
+++ pbx.c	14 Jun 2005 18:41:48 -0000	1.154.2.12
@@ -1775,7 +1775,7 @@
 int ast_pbx_run(struct ast_channel *c)
 {
 	int firstpass = 1;
-	char digit;
+	int digit;
 	char exten[256];
 	int pos;
 	int waittime;