summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2015-10-18 22:21:05 -0700
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2015-10-18 22:43:36 -0700
commitd5aa455a2575fca74219bb567ae4cb8c63a8401d (patch)
tree8e30647e71a12ea41506ff7e497e39c6f24bfa0a
parent6cc5153d77f9f48b8dd16e17e48eac4d6ef13929 (diff)
Silence -Wmissing-noreturn warnings
choose.c:463:1: warning: function 'RunChooser' could be declared with attribute 'noreturn' [-Wmissing-noreturn] chooser.c:1062:1: warning: function 'DoCancel' could be declared with attribute 'noreturn' [-Wmissing-noreturn] reset.c:81:1: warning: function 'abortReset' could be declared with attribute 'noreturn' [-Wmissing-noreturn] server.c:154:1: warning: function 'serverPauseAbort' could be declared with attribute 'noreturn' [-Wmissing-noreturn] server.c:161:1: warning: function 'serverPauseUsr1' could be declared with attribute 'noreturn' [-Wmissing-noreturn] server.c:236:1: warning: function 'abortOpen' could be declared with attribute 'noreturn' [-Wmissing-noreturn] server.c:329:1: warning: function 'PingLost' could be declared with attribute 'noreturn' [-Wmissing-noreturn] server.c:348:1: warning: function 'PingLostSig' could be declared with attribute 'noreturn' [-Wmissing-noreturn] session.c:231:1: warning: function 'catchTerm' could be declared with attribute 'noreturn' [-Wmissing-noreturn] session.c:293:1: warning: function 'SessionPingFailed' could be declared with attribute 'noreturn' [-Wmissing-noreturn] session.c:240:1: warning: function 'catchAlrm' could be declared with attribute 'noreturn' [-Wmissing-noreturn] session.c:249:1: warning: function 'waitAbort' could be declared with attribute 'noreturn' [-Wmissing-noreturn] session.c:330:1: warning: function 'ManageSession' could be declared with attribute 'noreturn' [-Wmissing-noreturn] session.c:471:1: warning: function 'syncTimeout' could be declared with attribute 'noreturn' [-Wmissing-noreturn] session.c:519:1: warning: function 'SessionExit' could be declared with attribute 'noreturn' [-Wmissing-noreturn] Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-rw-r--r--chooser/chooser.c1
-rw-r--r--include/dm.h8
-rw-r--r--xdm/reset.c1
-rw-r--r--xdm/server.c5
-rw-r--r--xdm/session.c4
5 files changed, 15 insertions, 4 deletions
diff --git a/chooser/chooser.c b/chooser/chooser.c
index 7d28f47..bbcf80c 100644
--- a/chooser/chooser.c
+++ b/chooser/chooser.c
@@ -1057,6 +1057,7 @@ DoCheckWilling (Widget w, XEvent *event, String *params, Cardinal *num_params)
}
/* ARGSUSED */
+_X_NORETURN
static void
DoCancel (Widget w, XEvent *event, String *params, Cardinal *num_params)
{
diff --git a/include/dm.h b/include/dm.h
index 2d670a0..4497f4e 100644
--- a/include/dm.h
+++ b/include/dm.h
@@ -376,7 +376,7 @@ extern void ForgetIndirectClient ( ARRAY8Ptr clientAddress, CARD16 connectionTyp
extern void ProcessChooserSocket (int fd);
/* in chooser.c */
-extern void RunChooser (struct display *d);
+extern void RunChooser (struct display *d) _X_NORETURN;
/* in daemon.c */
extern void BecomeDaemon (void);
@@ -440,10 +440,10 @@ extern int source (char **environ, char *file);
extern void ClearCloseOnFork (int fd);
extern void DeleteXloginResources (struct display *d, Display *dpy);
extern void LoadXloginResources (struct display *d);
-extern void ManageSession (struct display *d);
+extern void ManageSession (struct display *d) _X_NORETURN;
extern void SecureDisplay (struct display *d, Display *dpy);
-extern void SessionExit (struct display *d, int status, int removeAuth);
-extern void SessionPingFailed (struct display *d);
+extern void SessionExit (struct display *d, int status, int removeAuth) _X_NORETURN;
+extern void SessionPingFailed (struct display *d) _X_NORETURN;
extern void SetupDisplay (struct display *d);
extern void UnsecureDisplay (struct display *d, Display *dpy);
extern void execute(char **argv, char **environ);
diff --git a/xdm/reset.c b/xdm/reset.c
index fc6ba94..a9fd897 100644
--- a/xdm/reset.c
+++ b/xdm/reset.c
@@ -76,6 +76,7 @@ killWindows (Display *dpy, Window window)
static Jmp_buf resetJmp;
/* ARGSUSED */
+_X_NORETURN
static void
abortReset (int n)
{
diff --git a/xdm/server.c b/xdm/server.c
index dcb85c6..ffa1ffc 100644
--- a/xdm/server.c
+++ b/xdm/server.c
@@ -149,6 +149,7 @@ static Jmp_buf pauseAbort;
static int serverPauseRet;
/* ARGSUSED */
+_X_NORETURN
static void
serverPauseAbort (int n)
{
@@ -156,6 +157,7 @@ serverPauseAbort (int n)
}
/* ARGSUSED */
+_X_NORETURN
static void
serverPauseUsr1 (int n)
{
@@ -231,6 +233,7 @@ serverPause (unsigned t, pid_t serverPid)
static Jmp_buf openAbort;
/* ARGSUSED */
+_X_NORETURN
static void
abortOpen (int n)
{
@@ -324,6 +327,7 @@ ResetServer (struct display *d)
static Jmp_buf pingTime;
+_X_NORETURN
static void
PingLost (void)
{
@@ -339,6 +343,7 @@ PingLostIOErr (Display *dpy)
}
/* ARGSUSED */
+_X_NORETURN
static void
PingLostSig (int n)
{
diff --git a/xdm/session.c b/xdm/session.c
index eff9c74..9382414 100644
--- a/xdm/session.c
+++ b/xdm/session.c
@@ -226,6 +226,7 @@ static struct verify_info verify;
static Jmp_buf abortSession;
/* ARGSUSED */
+_X_NORETURN
static void
catchTerm (int n)
{
@@ -235,6 +236,7 @@ catchTerm (int n)
static Jmp_buf pingTime;
/* ARGSUSED */
+_X_NORETURN
static void
catchAlrm (int n)
{
@@ -244,6 +246,7 @@ catchAlrm (int n)
static Jmp_buf tenaciousClient;
/* ARGSUSED */
+_X_NORETURN
static void
waitAbort (int n)
{
@@ -466,6 +469,7 @@ DeleteXloginResources (struct display *d, Display *dpy)
static Jmp_buf syncJump;
/* ARGSUSED */
+_X_NORETURN
static void
syncTimeout (int n)
{