From 54ed938d393970584a9b2a8b0783b0c0901255db Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Thu, 30 Aug 2012 14:03:54 -0700
Subject: [PATCH] clang: Fix warnings found through clang.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 lib/drmtest.c              |  2 +-
 tests/gem_bad_length.c     |  4 ++++
 tests/gem_tiled_swapping.c | 12 ++++++------
 tests/testdisplay.c        |  2 +-
 tools/intel_bios_dumper.c  |  2 +-
 tools/intel_lid.c          |  2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index d605f79..8df9797 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -457,7 +457,7 @@ uint32_t prime_fd_to_handle(int fd, int dma_buf_fd)
 /* signal interrupt helpers */
 static pid_t signal_helper = -1;
 long long int sig_stat;
-static void signal_helper_process(pid_t pid)
+static void __attribute__((noreturn)) signal_helper_process(pid_t pid)
 {
 	/* Interrupt the parent process at 500Hz, just to be annoying */
 	while (1) {
diff --git a/tests/gem_bad_length.c b/tests/gem_bad_length.c
index 41f44d7..0f2268f 100644
--- a/tests/gem_bad_length.c
+++ b/tests/gem_bad_length.c
@@ -64,10 +64,12 @@ static uint32_t do_gem_create(int fd, int size, int *retval)
 	return create.handle;
 }
 
+#if 0
 static int gem_exec(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
 {
 	return drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf);
 }
+#endif
 
 static void create0(int fd)
 {
@@ -77,6 +79,7 @@ static void create0(int fd)
 	assert(retval == EINVAL);
 }
 
+#if 0
 static void exec0(int fd)
 {
 	struct drm_i915_gem_execbuffer2 execbuf;
@@ -115,6 +118,7 @@ static void exec0(int fd)
 
 	gem_close(fd, exec[0].handle);
 }
+#endif
 
 int main(int argc, char **argv)
 {
diff --git a/tests/gem_tiled_swapping.c b/tests/gem_tiled_swapping.c
index d1484f0..c04a3bc 100644
--- a/tests/gem_tiled_swapping.c
+++ b/tests/gem_tiled_swapping.c
@@ -62,7 +62,7 @@
 
 #define WIDTH 512
 #define HEIGHT 512
-static uint32_t linear[WIDTH * HEIGHT];
+#define LINEAR_DWORDS (4 * WIDTH * HEIGHT)
 static uint32_t current_tiling_mode;
 
 #define PAGE_SIZE 4096
@@ -74,14 +74,14 @@ create_bo_and_fill(int fd)
 	uint32_t *data;
 	int i;
 
-	handle = gem_create(fd, sizeof(linear));
+	handle = gem_create(fd, LINEAR_DWORDS);
 	gem_set_tiling(fd, handle, current_tiling_mode, WIDTH * sizeof(uint32_t));
 
 	/* Fill the BO with dwords starting at start_val */
-	data = gem_mmap(fd, handle, sizeof(linear), PROT_READ | PROT_WRITE);
+	data = gem_mmap(fd, handle, LINEAR_DWORDS, PROT_READ | PROT_WRITE);
 	for (i = 0; i < WIDTH*HEIGHT; i++)
 		data[i] = i;
-	munmap(data, sizeof(linear));
+	munmap(data, LINEAR_DWORDS);
 
 	return handle;
 }
@@ -129,14 +129,14 @@ main(int argc, char **argv)
 	for (i = 0; i < count/2; i++) {
 		/* Check the target bo's contents. */
 		data = gem_mmap(fd, bo_handles[idx_arr[i]],
-				sizeof(linear), PROT_READ | PROT_WRITE);
+				LINEAR_DWORDS, PROT_READ | PROT_WRITE);
 		for (j = 0; j < WIDTH*HEIGHT; j++)
 			if (data[j] != j) {
 				fprintf(stderr, "mismatch at %i: %i\n",
 						j, data[j]);
 				exit(1);
 			}
-		munmap(data, sizeof(linear));
+		munmap(data, LINEAR_DWORDS);
 	}
 
 	close(fd);
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 14d7da3..c52bb2f 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -598,7 +598,7 @@ int update_display(void)
 
 static char optstr[] = "hiaf:s:d:p:mrt";
 
-static void usage(char *name)
+static void __attribute__((noreturn)) usage(char *name)
 {
 	fprintf(stderr, "usage: %s [-hiasdpmtf]\n", name);
 	fprintf(stderr, "\t-i\tdump info\n");
diff --git a/tools/intel_bios_dumper.c b/tools/intel_bios_dumper.c
index 6455689..85bea97 100644
--- a/tools/intel_bios_dumper.c
+++ b/tools/intel_bios_dumper.c
@@ -40,7 +40,7 @@
 #define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)	/* 0666 */
 #endif
 
-static void usage(void)
+static void __attribute__((noreturn)) usage(void)
 {
 	fprintf(stderr, "usage: bios_dumper <filename>\n");
 	exit(1);
diff --git a/tools/intel_lid.c b/tools/intel_lid.c
index 908224e..51a95fe 100644
--- a/tools/intel_lid.c
+++ b/tools/intel_lid.c
@@ -85,7 +85,7 @@ static int i830_lvds_acpi_lid_state(void)
 		}
 	}
 	state_name = malloc(strlen(ACPI_LID) + strlen(lid_dent->d_name) + 7);
-	memset(state_name, 0, sizeof(state_name));
+	memset(state_name, 0, strlen(ACPI_LID) + strlen(lid_dent->d_name) + 7);
 	strcat(state_name, ACPI_LID);
 	strcat(state_name, lid_dent->d_name);
 	strcat(state_name, "/state");
-- 
2.7.4