summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Wood <thomas.wood@intel.com>2015-11-02 10:02:08 +0000
committerThomas Wood <thomas.wood@intel.com>2015-11-11 14:20:55 +0000
commit36b8143c224b47f743d8881514bb348b9ee1d102 (patch)
tree40ec1c934e6dbbaaec0f417bfb44762ac844570e
parent3bc3ab27eac6eace4c90c8da92b4e7570110263b (diff)
Add missing noreturn attribute to various functions
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
-rw-r--r--debugger/eudb.c2
-rw-r--r--lib/igt_core.c2
-rw-r--r--tests/gem_madvise.c2
-rw-r--r--tests/pm_rpm.c2
-rw-r--r--tests/testdisplay.c2
-rw-r--r--tools/intel_display_poller.c2
-rw-r--r--tools/intel_gpu_frequency.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/debugger/eudb.c b/debugger/eudb.c
index e015e2e3..47d5d922 100644
--- a/debugger/eudb.c
+++ b/debugger/eudb.c
@@ -326,7 +326,7 @@ db_shutdown(int sig) {
printf("Shutting down...\n");
}
-static void
+static void __attribute__((noreturn))
die(int reason) {
int i = 0;
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 59127caf..4fc0bd1c 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1750,7 +1750,7 @@ out:
}
static const char *timeout_op;
-static void igt_alarm_handler(int signal)
+static void __attribute__((noreturn)) igt_alarm_handler(int signal)
{
if (timeout_op)
igt_info("Timed out: %s\n", timeout_op);
diff --git a/tests/gem_madvise.c b/tests/gem_madvise.c
index 093d78ac..36408fe3 100644
--- a/tests/gem_madvise.c
+++ b/tests/gem_madvise.c
@@ -49,7 +49,7 @@ IGT_TEST_DESCRIPTION("Checks that the kernel reports EFAULT when trying to use"
static jmp_buf jmp;
-static void sigtrap(int sig)
+static void __attribute__((noreturn)) sigtrap(int sig)
{
longjmp(jmp, sig);
}
diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c
index d43cc067..c4fb19ce 100644
--- a/tests/pm_rpm.c
+++ b/tests/pm_rpm.c
@@ -1386,7 +1386,7 @@ static void pci_d3_state_subtest(void)
igt_assert(!device_in_pci_d3());
}
-static void stay_subtest(void)
+static void __attribute__((noreturn)) stay_subtest(void)
{
disable_all_screens_and_wait(&ms_data);
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 4efcb593..28875b2d 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -552,7 +552,7 @@ static void __attribute__((noreturn)) usage(char *name, char opt)
#define dump_resource(res) if (res) dump_##res()
-static void cleanup_and_exit(int ret)
+static void __attribute__((noreturn)) cleanup_and_exit(int ret)
{
close(drm_fd);
exit(ret);
diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c
index 56dcd447..eab17c52 100644
--- a/tools/intel_display_poller.c
+++ b/tools/intel_display_poller.c
@@ -946,7 +946,7 @@ static const char *test_name(enum test test, int pipe, int bit, bool test_pixel_
}
}
-static void usage(const char *name)
+static void __attribute__((noreturn)) usage(const char *name)
{
fprintf(stderr, "Usage: %s [options]\n"
" -t,--test <pipestat|iir|framecount|flipcount|pan|flip|surflive|wrap|field>\n"
diff --git a/tools/intel_gpu_frequency.c b/tools/intel_gpu_frequency.c
index 5ae47e77..cb758b0a 100644
--- a/tools/intel_gpu_frequency.c
+++ b/tools/intel_gpu_frequency.c
@@ -142,7 +142,7 @@ static int get_frequency(struct freq_info *freq_info)
return val;
}
-static void
+static void __attribute__((noreturn))
usage(const char *prog)
{
printf("%s A program to manipulate Intel GPU frequencies.\n\n", prog);