From 2fd815135e7769aa9dd0d3b8cb558350ba7eb70d Mon Sep 17 00:00:00 2001 From: Matt Craighead Date: Mon, 20 Jan 2014 15:06:06 -0800 Subject: fix compiler warnings Removed redundant declarations. Removed an unused variable. Fixed the sign of some loop variables. Signed-off-by: Matt Craighead Signed-off-by: Robert Morell Reviewed-by: Aaron Plattner Signed-off-by: Aaron Plattner --- main.c | 3 --- rendercheck.h | 4 ---- t_repeat.c | 2 +- tests.c | 2 -- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/main.c b/main.c index 5e6404c..51df7e4 100644 --- a/main.c +++ b/main.c @@ -27,9 +27,6 @@ #include #include -extern int num_ops; -extern int num_colors; - Bool is_verbose = FALSE, minimalrendering = FALSE; int enabled_tests = ~0; /* Enable all tests by default */ diff --git a/rendercheck.h b/rendercheck.h index 92ce789..18417a8 100644 --- a/rendercheck.h +++ b/rendercheck.h @@ -205,10 +205,6 @@ repeat_test(Display *dpy, picture_info *win, picture_info *dst, int op, picture_info *dst_color, picture_info *c1, picture_info *c2, Bool test_mask); -Bool -linear_gradient_test(Display *dpy, picture_info *win, - picture_info *dst, int op, picture_info *dst_color); - Bool triangles_test(Display *dpy, picture_info *win, picture_info *dst, int op, picture_info *src_color, picture_info *dst_color); diff --git a/t_repeat.c b/t_repeat.c index 679bca1..1abe542 100644 --- a/t_repeat.c +++ b/t_repeat.c @@ -49,7 +49,7 @@ Bool repeat_test(Display *dpy, picture_info *win, picture_info *dst, int op, picture_info *dst_color, picture_info *c1, picture_info *c2, Bool test_mask) { - int wi, hi; + unsigned int wi, hi; for (wi = 0; wi < sizeof(sizes) / sizeof(int); wi++) { int w = sizes[wi]; diff --git a/tests.c b/tests.c index aacd14d..bacc372 100644 --- a/tests.c +++ b/tests.c @@ -390,14 +390,12 @@ do_tests(Display *dpy, picture_info *win) errx(1, "malloc error"); for (i = 0; i < num_colors * nformats; i++) { - XRenderPictureAttributes pa; color4d *c = &colors[i / nformats]; /* The standard PictFormat numbers go from 0 to 4 */ pictures_10x10[i].format = format_list[i % nformats]; pictures_10x10[i].d = XCreatePixmap(dpy, DefaultRootWindow(dpy), 10, 10, pictures_10x10[i].format->depth); - pa.repeat = TRUE; pictures_10x10[i].pict = XRenderCreatePicture(dpy, pictures_10x10[i].d, pictures_10x10[i].format, 0, NULL); -- cgit v1.2.3