[Intel-gfx] [PATCH i-g-t 3/8] Add missing noreturn attribute to various functions
Thomas Wood
thomas.wood at intel.com
Mon Nov 2 03:48:39 PST 2015
Signed-off-by: Thomas Wood <thomas.wood at intel.com>
---
debugger/eudb.c | 2 +-
lib/igt_core.c | 2 +-
tests/gem_madvise.c | 2 +-
tests/pm_rpm.c | 2 +-
tests/testdisplay.c | 2 +-
tools/intel_display_poller.c | 2 +-
tools/intel_gpu_frequency.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debugger/eudb.c b/debugger/eudb.c
index e015e2e..47d5d92 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 7123455..7e99b24 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1755,7 +1755,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 093d78a..36408fe 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 d43cc06..c4fb19c 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 4efcb59..28875b2 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 56dcd44..eab17c5 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 5ae47e7..cb758b0 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);
--
1.9.1
More information about the Intel-gfx
mailing list