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

1 files changed, 17 insertions, 14 deletions

diff --git a/tests/modeprint/modeprint.c b/tests/modeprint/modeprint.c
index 595d4447..9cde77d5 100644
--- a/tests/modeprint/modeprint.c
+++ b/tests/modeprint/modeprint.c
@@ -50,20 +50,20 @@ int crtcs;
 int fbs;
 char *module_name;
 
-const char* getConnectionText(drmModeConnection conn)
+static const char* getConnectionText(drmModeConnection conn)
 {
 	switch (conn) {
 	case DRM_MODE_CONNECTED:
 		return "connected";
 	case DRM_MODE_DISCONNECTED:
 		return "disconnected";
-	default:
+	case DRM_MODE_UNKNOWNCONNECTION:
 		return "unknown";
 	}
-
+	return 0;
 }
 
-int printMode(struct drm_mode_modeinfo *mode)
+static int printMode(drmModeModeInfoPtr mode)
 {
 	if (full_modes) {
 		printf("Mode: %s\n", mode->name);
@@ -87,9 +87,9 @@ int printMode(struct drm_mode_modeinfo *mode)
 	return 0;
 }
 
-int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
+static int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t value)
 {
-	const unsigned char *name = NULL;
+	const char *name = NULL;
 	int j;
 
 	printf("Property: %s\n", props->name);
@@ -120,8 +120,11 @@ int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t
 		}
 
 	} else {
+#if 0
+		/* FIXME: Why here was this if statment? */
 		if (!strncmp(props->name, "DPMS", 4))
 			;
+#endif
 
 		for (j = 0; j < props->count_enums; j++) {
 			printf("\t\t%lld = %s\n", props->enums[j].value, props->enums[j].name);
@@ -139,10 +142,10 @@ int printProperty(int fd, drmModeResPtr res, drmModePropertyPtr props, uint64_t
 	return 0;
 }
 
-int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
+static int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uint32_t id)
 {
 	int i = 0;
-	struct drm_mode_modeinfo *mode = NULL;
+	drmModeModeInfoPtr mode = NULL;
 	drmModePropertyPtr props;
 
 	printf("Connector: %d-%d\n", connector->connector_type, connector->connector_type_id);
@@ -187,7 +190,7 @@ int printConnector(int fd, drmModeResPtr res, drmModeConnectorPtr connector, uin
 	return 0;
 }
 
-int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
+static int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t id)
 {
 	printf("Encoder\n");
 	printf("\tid     :%i\n", id);
@@ -198,7 +201,7 @@ int printEncoder(int fd, drmModeResPtr res, drmModeEncoderPtr encoder, uint32_t
 	return 0;
 }
 
-int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
+static int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
 {
 	printf("Crtc\n");
 	printf("\tid             : %i\n", id);
@@ -206,13 +209,13 @@ int printCrtc(int fd, drmModeResPtr res, drmModeCrtcPtr crtc, uint32_t id)
 	printf("\ty              : %i\n", crtc->y);
 	printf("\twidth          : %i\n", crtc->width);
 	printf("\theight         : %i\n", crtc->height);
-	printf("\tmode           : %p\n", &crtc->mode);
+	printf("\tmode           : %p\n", (void*)&crtc->mode);
 	printf("\tgamma size     : %d\n", crtc->gamma_size);
 
 	return 0;
 }
 
-int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
+static int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
 {
 	printf("Framebuffer\n");
 	printf("\thandle    : %i\n", fb->handle);
@@ -226,7 +229,7 @@ int printFrameBuffer(int fd, drmModeResPtr res, drmModeFBPtr fb)
 	return 0;
 }
 
-int printRes(int fd, drmModeResPtr res)
+static int printRes(int fd, drmModeResPtr res)
 {
 	int i;
 	drmModeFBPtr fb;
@@ -302,7 +305,7 @@ int printRes(int fd, drmModeResPtr res)
 	return 0;
 }
 
-void args(int argc, char **argv)
+static void args(int argc, char **argv)
 {
 	int i;