summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon <ron@debian.org>2009-06-27 04:44:18 +0930
committerMike Frysinger <vapier@gentoo.org>2009-07-05 20:27:16 -0400
commit5efcfdc5150304f80b1ffb8b37c67c17e98a0d50 (patch)
treef0d28376c4292791ae2870bff13a26d5cedbbd73
parent680ef7ed1f01ab4fb77868a9dc5078273fb41bc6 (diff)
Add noreturn attributes to some functions that won't ever do so
usage() is also made static in answer to warnings about no prototype. In __pthread_manager_event() we also have to drop the return statement, else gcc will in turn complain about a non-returning function having one. Signed-off-by: Ron Lee <ron@debian.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--libpthread/linuxthreads.old/manager.c4
-rw-r--r--utils/ldconfig.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libpthread/linuxthreads.old/manager.c b/libpthread/linuxthreads.old/manager.c
index 19be92fdf..0617d7dd9 100644
--- a/libpthread/linuxthreads.old/manager.c
+++ b/libpthread/linuxthreads.old/manager.c
@@ -248,7 +248,7 @@ int attribute_noreturn __pthread_manager(void *arg)
}
}
-int __pthread_manager_event(void *arg)
+int attribute_noreturn __pthread_manager_event(void *arg)
{
/* If we have special thread_self processing, initialize it. */
#ifdef INIT_THREAD_SELF
@@ -260,7 +260,7 @@ int __pthread_manager_event(void *arg)
/* Free it immediately. */
__pthread_unlock (THREAD_GETMEM((&__pthread_manager_thread), p_lock));
- return __pthread_manager(arg);
+ __pthread_manager(arg);
}
/* Process creation */
diff --git a/utils/ldconfig.c b/utils/ldconfig.c
index c52b170de..f6aec5c82 100644
--- a/utils/ldconfig.c
+++ b/utils/ldconfig.c
@@ -114,7 +114,7 @@ static void warnx(const char *s, ...)
fprintf(stderr, "\n");
}
-static void err(int errnum, const char *s, ...)
+static void attribute_noreturn err(int errnum, const char *s, ...)
{
va_list p;
@@ -783,7 +783,7 @@ void cache_print(void)
}
#endif
-void usage(void)
+static void attribute_noreturn usage(void)
{
fprintf(stderr,
#ifdef __LDSO_CACHE_SUPPORT__