[Asterisk-cvs] asterisk/res res_adsi.c, 1.14, 1.15 res_features.c,
1.64, 1.65
russell
russell
Sun Aug 7 21:13:01 CDT 2005
Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv3383/res
Modified Files:
res_adsi.c res_features.c
Log Message:
more pointer signedness fixes for gcc4 warnings
Index: res_adsi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_adsi.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- res_adsi.c 6 Jun 2005 22:12:19 -0000 1.14
+++ res_adsi.c 8 Aug 2005 01:16:44 -0000 1.15
@@ -56,7 +56,7 @@
static int alignment = 0;
-static int adsi_generate(unsigned char *buf, int msgtype, char *msg, int msglen, int msgnum, int last, int codec)
+static int adsi_generate(unsigned char *buf, int msgtype, unsigned char *msg, int msglen, int msgnum, int last, int codec)
{
int sum;
int x;
@@ -306,7 +306,7 @@
}
-int adsi_begin_download(struct ast_channel *chan, char *service, char *fdn, char *sec, int version)
+int adsi_begin_download(struct ast_channel *chan, unsigned char *service, unsigned char *fdn, unsigned char *sec, int version)
{
int bytes;
unsigned char buf[256];
@@ -592,7 +592,7 @@
int adsi_get_cpeid(struct ast_channel *chan, unsigned char *cpeid, int voice)
{
- char buf[256];
+ unsigned char buf[256];
int bytes = 0;
int res;
bytes += adsi_data_mode(buf);
@@ -624,7 +624,7 @@
int adsi_get_cpeinfo(struct ast_channel *chan, int *width, int *height, int *buttons, int voice)
{
- char buf[256];
+ unsigned char buf[256];
int bytes = 0;
int res;
bytes += adsi_data_mode(buf);
@@ -636,46 +636,46 @@
/* Get width */
memset(buf, 0, sizeof(buf));
- res = ast_readstring(chan, buf, 2, 1000, 500, "");
+ res = ast_readstring(chan, (char *)buf, 2, 1000, 500, "");
if (res < 0)
return res;
- if (strlen(buf) != 2) {
+ if (strlen((char *)buf) != 2) {
ast_log(LOG_WARNING, "Got %d bytes of width, expecting 2\n", res);
res = 0;
} else {
res = 1;
}
if (width)
- *width = atoi(buf);
+ *width = atoi((char *)buf);
/* Get height */
memset(buf, 0, sizeof(buf));
if (res) {
- res = ast_readstring(chan, buf, 2, 1000, 500, "");
+ res = ast_readstring(chan, (char *)buf, 2, 1000, 500, "");
if (res < 0)
return res;
- if (strlen(buf) != 2) {
+ if (strlen((char *)buf) != 2) {
ast_log(LOG_WARNING, "Got %d bytes of height, expecting 2\n", res);
res = 0;
} else {
res = 1;
}
if (height)
- *height= atoi(buf);
+ *height= atoi((char *)buf);
}
/* Get buttons */
memset(buf, 0, sizeof(buf));
if (res) {
- res = ast_readstring(chan, buf, 1, 1000, 500, "");
+ res = ast_readstring(chan, (char *)buf, 1, 1000, 500, "");
if (res < 0)
return res;
- if (strlen(buf) != 1) {
+ if (strlen((char *)buf) != 1) {
ast_log(LOG_WARNING, "Got %d bytes of buttons, expecting 1\n", res);
res = 0;
} else {
res = 1;
}
if (buttons)
- *buttons = atoi(buf);
+ *buttons = atoi((char *)buf);
}
if (voice) {
bytes = 0;
@@ -846,7 +846,7 @@
{
int bytes = 0;
- if (!strlen(format1))
+ if (!strlen((char *)format1))
return -1;
buf[bytes++] = ADSI_INPUT_FORMAT;
@@ -854,7 +854,7 @@
buf[bytes++] = ((dir & 1) << 7) | ((wrap & 1) << 6) | (num & 0x7);
bytes += ccopy(buf + bytes, format1, 20);
buf[bytes++] = 0xff;
- if (format2 && strlen(format2)) {
+ if (format2 && strlen((char *)format2)) {
bytes += ccopy(buf + bytes, format2, 20);
}
buf[1] = bytes - 2;
@@ -909,7 +909,7 @@
int adsi_channel_restore(struct ast_channel *chan)
{
- char dsp[256];
+ unsigned char dsp[256];
int bytes;
int x;
unsigned char keyd[6];
@@ -934,14 +934,14 @@
}
-int adsi_print(struct ast_channel *chan, char **lines, int *aligns, int voice)
+int adsi_print(struct ast_channel *chan, unsigned char **lines, int *aligns, int voice)
{
- char buf[4096];
+ unsigned char buf[4096];
int bytes=0;
int res;
int x;
for(x=0;lines[x];x++)
- bytes += adsi_display(buf + bytes, ADSI_INFO_PAGE, x+1, aligns[x],0, lines[x], "");
+ bytes += adsi_display(buf + bytes, ADSI_INFO_PAGE, x+1, aligns[x], 0, lines[x], (unsigned char *)"");
bytes += adsi_set_line(buf + bytes, ADSI_INFO_PAGE, 1);
if (voice) {
bytes += adsi_voice_mode(buf + bytes, 0);
@@ -956,7 +956,7 @@
int adsi_load_session(struct ast_channel *chan, unsigned char *app, int ver, int data)
{
- char dsp[256];
+ unsigned char dsp[256];
int bytes;
int res;
char resp[2];
@@ -965,7 +965,7 @@
/* Connect to session */
bytes = 0;
- bytes += adsi_connect_session(dsp + bytes, app,ver);
+ bytes += adsi_connect_session(dsp + bytes, app, ver);
if (data)
bytes += adsi_data_mode(dsp + bytes);
@@ -997,7 +997,7 @@
int adsi_unload_session(struct ast_channel *chan)
{
- char dsp[256];
+ unsigned char dsp[256];
int bytes;
memset(dsp, 0, sizeof(dsp));
Index: res_features.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_features.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- res_features.c 3 Aug 2005 04:42:59 -0000 1.64
+++ res_features.c 8 Aug 2005 01:16:44 -0000 1.65
@@ -248,10 +248,10 @@
int res;
int justify[5] = {ADSI_JUST_CENT, ADSI_JUST_CENT, ADSI_JUST_CENT, ADSI_JUST_CENT};
char tmp[256] = "";
- char *message[5] = {NULL, NULL, NULL, NULL, NULL};
+ unsigned char *message[5] = {NULL, NULL, NULL, NULL, NULL};
snprintf(tmp, sizeof(tmp), "Parked on %d", parkingnum);
- message[0] = tmp;
+ message[0] = (unsigned char *)tmp;
res = adsi_load_session(chan, NULL, 0, 1);
if (res == -1) {
return res;
More information about the svn-commits
mailing list