clang: Fix static analysis warnings from clang

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Ben Widawsky 2012-08-30 14:17:01 -07:00
parent 54ed938d39
commit bc62567b77
6 changed files with 11 additions and 12 deletions

View File

@ -842,6 +842,7 @@ static void ricochet(
set.flags = I915_SET_COLORKEY_NONE; set.flags = I915_SET_COLORKEY_NONE;
ret = drmCommandWrite(gfx_fd, DRM_I915_SET_SPRITE_COLORKEY, &set, ret = drmCommandWrite(gfx_fd, DRM_I915_SET_SPRITE_COLORKEY, &set,
sizeof(set)); sizeof(set));
assert(ret == 0);
// Set up sprite output dimensions, initial position, etc. // Set up sprite output dimensions, initial position, etc.
if (out_w > prim_width / 2) if (out_w > prim_width / 2)

View File

@ -264,7 +264,6 @@ static void set_mode(struct test_output *o, int crtc)
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if (now.tv_sec > end.tv_sec || if (now.tv_sec > end.tv_sec ||
(now.tv_sec == end.tv_sec && now.tv_usec >= end.tv_usec)) { (now.tv_sec == end.tv_sec && now.tv_usec >= end.tv_usec)) {
ret = 0;
break; break;
} }

View File

@ -89,8 +89,9 @@ int main(int argc, char *argv[])
if (!is_alive()) { if (!is_alive()) {
INFO_PRINT("gpu reset? restarting daemon\n"); INFO_PRINT("gpu reset? restarting daemon\n");
intel_register_access_fini(); intel_register_access_fini();
ret = intel_register_access_init(intel_get_pci_device(), ret = intel_register_access_init(intel_get_pci_device(), 1);
1); if (ret)
INFO_PRINT("Reg access init fail\n");
} }
sleep(1); sleep(1);
} }

View File

@ -466,8 +466,6 @@ int main(int argc, char **argv)
break; break;
} }
} }
argc -= optind;
argv += optind;
pci_dev = intel_get_pci_device(); pci_dev = intel_get_pci_device();
devid = pci_dev->device_id; devid = pci_dev->device_id;

View File

@ -381,7 +381,7 @@ static void dump_raw_infoframe(DipInfoFrame *frame)
static void dump_avi_info(Transcoder transcoder) static void dump_avi_info(Transcoder transcoder)
{ {
Register reg = get_dip_ctl_reg(transcoder); Register reg = get_dip_ctl_reg(transcoder);
uint32_t val = INREG(reg); uint32_t val;
DipFrequency freq; DipFrequency freq;
DipInfoFrame frame; DipInfoFrame frame;
@ -427,7 +427,7 @@ static void dump_avi_info(Transcoder transcoder)
static void dump_vendor_info(Transcoder transcoder) static void dump_vendor_info(Transcoder transcoder)
{ {
Register reg = get_dip_ctl_reg(transcoder); Register reg = get_dip_ctl_reg(transcoder);
uint32_t val = INREG(reg); uint32_t val;
DipFrequency freq; DipFrequency freq;
DipInfoFrame frame; DipInfoFrame frame;
@ -453,7 +453,7 @@ static void dump_vendor_info(Transcoder transcoder)
static void dump_gamut_info(Transcoder transcoder) static void dump_gamut_info(Transcoder transcoder)
{ {
Register reg = get_dip_ctl_reg(transcoder); Register reg = get_dip_ctl_reg(transcoder);
uint32_t val = INREG(reg); uint32_t val;
DipFrequency freq; DipFrequency freq;
DipInfoFrame frame; DipInfoFrame frame;
@ -479,7 +479,7 @@ static void dump_gamut_info(Transcoder transcoder)
static void dump_spd_info(Transcoder transcoder) static void dump_spd_info(Transcoder transcoder)
{ {
Register reg = get_dip_ctl_reg(transcoder); Register reg = get_dip_ctl_reg(transcoder);
uint32_t val = INREG(reg); uint32_t val;
DipFrequency freq; DipFrequency freq;
DipInfoFrame frame; DipInfoFrame frame;
char vendor[9]; char vendor[9];
@ -660,7 +660,7 @@ static int parse_infoframe_option_s(const char *name, const char *s,
static void change_avi_infoframe(Transcoder transcoder, char *commands) static void change_avi_infoframe(Transcoder transcoder, char *commands)
{ {
Register reg = get_dip_ctl_reg(transcoder); Register reg = get_dip_ctl_reg(transcoder);
uint32_t val = INREG(reg); uint32_t val;
DipInfoFrame frame; DipInfoFrame frame;
char option[32]; char option[32];
uint32_t option_val; uint32_t option_val;
@ -760,7 +760,7 @@ static void change_avi_infoframe(Transcoder transcoder, char *commands)
static void change_spd_infoframe(Transcoder transcoder, char *commands) static void change_spd_infoframe(Transcoder transcoder, char *commands)
{ {
Register reg = get_dip_ctl_reg(transcoder); Register reg = get_dip_ctl_reg(transcoder);
uint32_t val = INREG(reg); uint32_t val;
DipInfoFrame frame; DipInfoFrame frame;
char option[16]; char option[16];
char option_val_s[32]; char option_val_s[32];

View File

@ -2158,7 +2158,7 @@ intel_dump_other_regs(void)
} else { } else {
n = ((fp >> 16) & 0x3f); n = ((fp >> 16) & 0x3f);
m2 = ((fp >> 0) & 0x3f); m2 = ((fp >> 0) & 0x3f);
m = 5 * (m1 + 2) + (m2 + 2); //m = 5 * (m1 + 2) + (m2 + 2);
dot = dot =
(ref * (5 * (m1 + 2) + (m2 + 2)) / (n + 2)) / (p1 * (ref * (5 * (m1 + 2) + (m2 + 2)) / (n + 2)) / (p1 *
p2); p2);