[Asterisk-cvs] asterisk/apps app_adsiprog.c, 1.13, 1.14 app_getcpeid.c, 1.7, 1.8 app_voicemail.c, 1.243, 1.244

kpfleming kpfleming
Wed Sep 7 14:54:42 CDT 2005


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

Modified Files:
	app_adsiprog.c app_getcpeid.c app_voicemail.c 
Log Message:
eliminate signedness warnings (issue #5129)


Index: app_adsiprog.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_adsiprog.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_adsiprog.c	10 Jul 2005 23:12:25 -0000	1.13
+++ app_adsiprog.c	7 Sep 2005 18:55:03 -0000	1.14
@@ -161,9 +161,9 @@
 	struct adsi_flag flags[7];
 
 	/* Stuff from adsi script */
-	char sec[5];
+	unsigned char sec[5];
 	char desc[19];
-	char fdn[5];
+	unsigned char fdn[5];
 	int ver;
 };
 
@@ -1427,7 +1427,7 @@
 {
 	struct adsi_script *scr;
 	int x;
-	char buf[1024];
+	unsigned char buf[1024];
 	int bytes;
 	scr = compile_script(script);
 	if (!scr) 

Index: app_getcpeid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_getcpeid.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_getcpeid.c	29 Aug 2005 21:18:35 -0000	1.7
+++ app_getcpeid.c	7 Sep 2005 18:55:03 -0000	1.8
@@ -46,7 +46,7 @@
 static int cpeid_setstatus(struct ast_channel *chan, char *stuff[], int voice)
 {
 	int justify[5] = { ADSI_JUST_CENT, ADSI_JUST_LEFT, ADSI_JUST_LEFT, ADSI_JUST_LEFT };
-	unsigned char *tmp[5];
+	char *tmp[5];
 	int x;
 	for (x=0;x<4;x++)
 		tmp[x] = stuff[x];

Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- app_voicemail.c	29 Aug 2005 16:08:53 -0000	1.243
+++ app_voicemail.c	7 Sep 2005 18:55:03 -0000	1.244
@@ -351,8 +351,8 @@
 static char emailtitle[100];
 static char charset[32] = "ISO-8859-1";
 
-static char adsifdn[4] = "\x00\x00\x00\x0F";
-static char adsisec[4] = "\x9B\xDB\xF7\xAC";
+static unsigned char adsifdn[4] = "\x00\x00\x00\x0F";
+static unsigned char adsisec[4] = "\x9B\xDB\xF7\xAC";
 static int adsiver = 1;
 static char emaildateformat[32] = "%A, %B %d, %Y at %r";
 
@@ -2685,7 +2685,7 @@
 
 static int adsi_load_vmail(struct ast_channel *chan, int *useadsi)
 {
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 	int x;
 	char num[5];
@@ -2831,7 +2831,7 @@
 
 static void adsi_login(struct ast_channel *chan)
 {
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 	unsigned char keys[8];
 	int x;
@@ -2857,7 +2857,7 @@
 
 static void adsi_password(struct ast_channel *chan)
 {
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 	unsigned char keys[8];
 	int x;
@@ -2879,7 +2879,7 @@
 
 static void adsi_folders(struct ast_channel *chan, int start, char *label)
 {
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 	unsigned char keys[8];
 	int x,y;
@@ -2909,7 +2909,8 @@
 static void adsi_message(struct ast_channel *chan, struct vm_state *vms)
 {
 	int bytes=0;
-	char buf[256], buf1[256], buf2[256];
+	unsigned char buf[256]; 
+	char buf1[256], buf2[256];
 	char fn2[256];
 
 	char cid[256]="";
@@ -2930,16 +2931,16 @@
 	f = fopen(fn2, "r");
 	if (f) {
 		while (!feof(f)) {	
-			fgets(buf, sizeof(buf), f);
+			fgets((char *)buf, sizeof(buf), f);
 			if (!feof(f)) {
 				char *stringp=NULL;
-				stringp=buf;
+				stringp = (char *)buf;
 				strsep(&stringp, "=");
 				val = strsep(&stringp, "=");
 				if (val && !ast_strlen_zero(val)) {
-					if (!strcmp(buf, "callerid"))
+					if (!strcmp((char *)buf, "callerid"))
 						ast_copy_string(cid, val, sizeof(cid));
-					if (!strcmp(buf, "origdate"))
+					if (!strcmp((char *)buf, "origdate"))
 						ast_copy_string(datetime, val, sizeof(datetime));
 				}
 			}
@@ -3001,7 +3002,7 @@
 static void adsi_delete(struct ast_channel *chan, struct vm_state *vms)
 {
 	int bytes=0;
-	char buf[256];
+	unsigned char buf[256];
 	unsigned char keys[8];
 
 	int x;
@@ -3045,7 +3046,8 @@
 
 static void adsi_status(struct ast_channel *chan, struct vm_state *vms)
 {
-	char buf[256] = "", buf1[256] = "", buf2[256] = "";
+	unsigned char buf[256] = "";
+	char buf1[256] = "", buf2[256] = "";
 	int bytes=0;
 	unsigned char keys[8];
 	int x;
@@ -3091,7 +3093,8 @@
 
 static void adsi_status2(struct ast_channel *chan, struct vm_state *vms)
 {
-	char buf[256] = "", buf1[256] = "", buf2[256] = "";
+	unsigned char buf[256] = "";
+	char buf1[256] = "", buf2[256] = "";
 	int bytes=0;
 	unsigned char keys[8];
 	int x;
@@ -3146,7 +3149,7 @@
 
 static void adsi_goodbye(struct ast_channel *chan)
 {
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 
 	if (!adsi_available(chan))
@@ -4522,7 +4525,7 @@
 	char newpassword[80] = "";
 	char newpassword2[80] = "";
 	char prefile[256]="";
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 
 	if (adsi_available(chan)) {
@@ -4596,7 +4599,7 @@
 	char newpassword[80] = "";
 	char newpassword2[80] = "";
 	char prefile[256]="";
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 
 	if (adsi_available(chan))
@@ -4691,7 +4694,7 @@
 	int retries = 0;
 	int duration = 0;
 	char prefile[256]="";
-	char buf[256];
+	unsigned char buf[256];
 	int bytes=0;
 
 	if (adsi_available(chan))




More information about the svn-commits mailing list