libdrm/tests: Fix compiler warnings in modetest.c.

1 files changed, 23 insertions, 25 deletions

diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index 6c69a570..7b1bb1b4 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -63,12 +63,12 @@ int fd, modes;
 
 struct type_name {
 	int type;
-	char *name;
+	const char *name;
 };
 
 #define type_name_fn(res) \
-char * res##_str(int type) {			\
-	int i;						\
+static const char * res##_str(int type) {			\
+	unsigned int i;						\
 	for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \
 		if (res##_names[i].type == type)	\
 			return res##_names[i].name;	\
@@ -112,7 +112,7 @@ struct type_name connector_type_names[] = {
 
 type_name_fn(connector_type)
 
-void dump_encoders(void)
+static void dump_encoders(void)
 {
 	drmModeEncoder *encoder;
 	int i;
@@ -138,7 +138,7 @@ void dump_encoders(void)
 	printf("\n");
 }
 
-void dump_mode(drmModeModeInfo *mode)
+static void dump_mode(drmModeModeInfo *mode)
 {
 	printf("  %s %.02f %d %d %d %d %d %d %d %d\n",
 	       mode->name,
@@ -166,7 +166,7 @@ dump_props(drmModeConnector *connector)
 	}
 }
 
-void dump_connectors(void)
+static void dump_connectors(void)
 {
 	drmModeConnector *connector;
 	int i, j;
@@ -207,7 +207,7 @@ void dump_connectors(void)
 	printf("\n");
 }
 
-void dump_crtcs(void)
+static void dump_crtcs(void)
 {
 	drmModeCrtc *crtc;
 	int i;
@@ -234,7 +234,7 @@ void dump_crtcs(void)
 	printf("\n");
 }
 
-void dump_framebuffers(void)
+static void dump_framebuffers(void)
 {
 	drmModeFB *fb;
 	int i;
@@ -251,7 +251,8 @@ void dump_framebuffers(void)
 		}
 		printf("%d\t(%dx%d)\t%d\n",
 		       fb->fb_id,
-		       fb->width, fb->height);
+		       fb->width, fb->height,
+			   fb->bpp);
 
 		drmModeFreeFB(fb);
 	}
@@ -266,7 +267,7 @@ void dump_framebuffers(void)
  * can bind it with a free crtc.
  */
 struct connector {
-	int id;
+	unsigned int id;
 	char mode_str[64];
 	drmModeModeInfo *mode;
 	drmModeEncoder *encoder;
@@ -277,7 +278,7 @@ static void
 connector_find_mode(struct connector *c)
 {
 	drmModeConnector *connector;
-	int i, j, size, ret, width, height;
+	int i, j;
 
 	/* First, find the connector & mode */
 	c->mode = NULL;
@@ -348,7 +349,7 @@ create_test_buffer(drm_intel_bufmgr *bufmgr,
 {
 	drm_intel_bo *bo;
 	unsigned int *fb_ptr;
-	int size, ret, i, stride;
+	int size, i, stride;
 	div_t d;
 	cairo_surface_t *surface;
 	cairo_t *cr;
@@ -460,13 +461,10 @@ create_test_buffer(drm_intel_bufmgr *bufmgr,
 static void
 set_mode(struct connector *c, int count)
 {
-	drmModeConnector *connector;
-	drmModeEncoder *encoder = NULL;
-	struct drm_mode_modeinfo *mode = NULL;
 	drm_intel_bufmgr *bufmgr;
 	drm_intel_bo *bo;
 	unsigned int fb_id;
-	int i, j, ret, width, height, x, stride;
+	int i, ret, width, height, x, stride;
 
 	width = 0;
 	height = 0;
@@ -497,7 +495,6 @@ set_mode(struct connector *c, int count)
 
 	x = 0;
 	for (i = 0; i < count; i++) {
-		int crtc_id;
 		if (c[i].mode == NULL)
 			continue;
 
@@ -519,7 +516,7 @@ extern char *optarg;
 extern int optind, opterr, optopt;
 static char optstr[] = "ecpmfs:";
 
-void usage(char *name)
+static void usage(char *name)
 {
 	fprintf(stderr, "usage: %s [-ecpmf]\n", name);
 	fprintf(stderr, "\t-e\tlist encoders\n");
@@ -539,9 +536,10 @@ int main(int argc, char **argv)
 {
 	int c;
 	int encoders = 0, connectors = 0, crtcs = 0, framebuffers = 0;
-	char *modules[] = { "i915", "radeon" };
-	char *modeset = NULL, *mode, *connector;
-	int i, connector_id, count = 0;
+	const char *modules[] = { "i915", "radeon" };
+	char *modeset = NULL;
+	unsigned int i; 
+	int count = 0;
 	struct connector con_args[2];
 	
 	opterr = 0;
@@ -565,13 +563,13 @@ int main(int argc, char **argv)
 		case 's':
 			modeset = strdup(optarg);
 			con_args[count].crtc = -1;
-			if (sscanf(optarg, "%d:%64s",
+			if (sscanf(optarg, "%u:%64s",
 				   &con_args[count].id,
-				   &con_args[count].mode_str) != 2 &&
-			    sscanf(optarg, "%d@%d:%64s",
+				   con_args[count].mode_str) != 2 &&
+			    sscanf(optarg, "%u@%d:%64s",
 				   &con_args[count].id,
 				   &con_args[count].crtc,
-				   &con_args[count].mode_str) != 3)
+				   con_args[count].mode_str) != 3)
 				usage(argv[0]);
 			count++;				      
 			break;