Commit 73c4dd9253f8d43c436fc88e64096910f4f1b8ee
2009-06-15T21:26:02
Add noreturn declaration compatible with the MSVC compiler. MSVC provides a compiler declaration to declare that a function never returns. This declaration is required in front of the function definition rather than at the end, but fortunately gcc is compatible with this location as well. Explicit returns are no longer required after calls to test_die. Signed-off-by: Julio Espinoza-Sokal <julioes@gmail.com> Signed-off-by: Andreas Ericsson <ae@op5.se>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/tests/t0020-dirent.c b/tests/t0020-dirent.c
index e8abd2f..966f3c5 100644
--- a/tests/t0020-dirent.c
+++ b/tests/t0020-dirent.c
@@ -105,7 +105,6 @@ static int one_entry(void *state, char *path)
}
}
test_die("unexpected path \"%s\"", path);
- return -1;
}
@@ -189,7 +188,6 @@ static walk_data empty = {
static int dont_call_me(void *state, char *path)
{
test_die("dont_call_me: unexpected callback!");
- return -1;
}
BEGIN_TEST(empty)
diff --git a/tests/test_lib.h b/tests/test_lib.h
index 52121c9..8e9d2f9 100644
--- a/tests/test_lib.h
+++ b/tests/test_lib.h
@@ -29,6 +29,8 @@
/** Declare a function never returns to the caller. */
#ifdef __GNUC__
# define NORETURN __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+# define NORETURN __declspec(noreturn)
#else
# define NORETURN /* noreturn */
#endif
@@ -61,8 +63,7 @@ extern void test_end(void);
*
* @param fmt printf style format string.
*/
-extern void test_die(const char *fmt, ...)
- NORETURN
+extern void NORETURN test_die(const char *fmt, ...)
GIT_FORMAT_PRINTF(1, 2);
/**