More warning fixes in hw/xfree86
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
c78be3a4b7
commit
493d992501
|
@ -500,6 +500,7 @@ bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr)
|
||||||
{
|
{
|
||||||
BT829Ptr bt;
|
BT829Ptr bt;
|
||||||
I2CByte a;
|
I2CByte a;
|
||||||
|
char *devname;
|
||||||
|
|
||||||
bt = calloc(1, sizeof(BT829Rec));
|
bt = calloc(1, sizeof(BT829Rec));
|
||||||
if (bt == NULL)
|
if (bt == NULL)
|
||||||
|
@ -520,31 +521,31 @@ bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr)
|
||||||
|
|
||||||
bt->id = btread(bt, IDCODE);
|
bt->id = btread(bt, IDCODE);
|
||||||
|
|
||||||
free(bt->d.DevName);
|
free((void *) bt->d.DevName);
|
||||||
bt->d.DevName = calloc(200, sizeof(char));
|
bt->d.DevName = devname = calloc(200, sizeof(char));
|
||||||
switch (BTVERSION) {
|
switch (BTVERSION) {
|
||||||
case BT815:
|
case BT815:
|
||||||
sprintf(bt->d.DevName, "bt815a video decoder, revision %d",
|
sprintf(devname, "bt815a video decoder, revision %d",
|
||||||
bt->id & 0xf);
|
bt->id & 0xf);
|
||||||
break;
|
break;
|
||||||
case BT817:
|
case BT817:
|
||||||
sprintf(bt->d.DevName, "bt817a video decoder, revision %d",
|
sprintf(devname, "bt817a video decoder, revision %d",
|
||||||
bt->id & 0xf);
|
bt->id & 0xf);
|
||||||
break;
|
break;
|
||||||
case BT819:
|
case BT819:
|
||||||
sprintf(bt->d.DevName, "bt819a video decoder, revision %d",
|
sprintf(devname, "bt819a video decoder, revision %d",
|
||||||
bt->id & 0xf);
|
bt->id & 0xf);
|
||||||
break;
|
break;
|
||||||
case BT827:
|
case BT827:
|
||||||
sprintf(bt->d.DevName, "bt827a/b video decoder, revision %d",
|
sprintf(devname, "bt827a/b video decoder, revision %d",
|
||||||
bt->id & 0xf);
|
bt->id & 0xf);
|
||||||
break;
|
break;
|
||||||
case BT829:
|
case BT829:
|
||||||
sprintf(bt->d.DevName, "bt829a/b video decoder, revision %d",
|
sprintf(devname, "bt829a/b video decoder, revision %d",
|
||||||
bt->id & 0xf);
|
bt->id & 0xf);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
sprintf(bt->d.DevName,
|
sprintf(devname,
|
||||||
"bt8xx/unknown video decoder version %d, revision %d",
|
"bt8xx/unknown video decoder version %d, revision %d",
|
||||||
bt->id >> 4, bt->id & 0xf);
|
bt->id >> 4, bt->id & 0xf);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -163,7 +163,7 @@ DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr)
|
||||||
m->d.ByteTimeout = b->ByteTimeout;
|
m->d.ByteTimeout = b->ByteTimeout;
|
||||||
|
|
||||||
if (!I2C_WriteRead(&(m->d), NULL, 0, &a, 1)) {
|
if (!I2C_WriteRead(&(m->d), NULL, 0, &a, 1)) {
|
||||||
free(m->d.DevName);
|
free((void *) m->d.DevName);
|
||||||
free(m);
|
free(m);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -250,12 +250,12 @@ DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr)
|
||||||
supported ? "" : " (unsupported)", rom_version, m->chip_id);
|
supported ? "" : " (unsupported)", rom_version, m->chip_id);
|
||||||
|
|
||||||
if (!supported) {
|
if (!supported) {
|
||||||
free(m->d.DevName);
|
free((void *) m->d.DevName);
|
||||||
free(m);
|
free(m);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (!I2CDevInit(&(m->d))) {
|
if (!I2CDevInit(&(m->d))) {
|
||||||
free(m->d.DevName);
|
free((void *) m->d.DevName);
|
||||||
free(m);
|
free(m);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -356,8 +356,10 @@ VBESetModeNames(DisplayModePtr pMode)
|
||||||
pMode->name = strdup("BADMODE");
|
pMode->name = strdup("BADMODE");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
XNFasprintf(&pMode->name, "%dx%d",
|
char *tmp;
|
||||||
|
XNFasprintf(&tmp, "%dx%d",
|
||||||
pMode->HDisplay, pMode->VDisplay);
|
pMode->HDisplay, pMode->VDisplay);
|
||||||
|
pMode->name = tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pMode = pMode->next;
|
pMode = pMode->next;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user