summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-23 10:07:03 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-02-23 10:07:17 -0800
commit21e6ddc42acc7864fb260c101060dee5cebf07c1 (patch)
treeb12535601aa2edcb99590f7824b0a7bd928dafbe
parentef04ccaac0e501612367c098410129f89e1d109a (diff)
downloadiceauth-21e6ddc42acc7864fb260c101060dee5cebf07c1.tar.gz
Add _X_NORETURN attributes suggested by gcc
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--iceauth.c3
-rw-r--r--process.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 30caccc..d300e5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(ICEAUTH, xproto ice)
+PKG_CHECK_MODULES(ICEAUTH, [xproto >= 7.0.17 ice])
XORG_WITH_LINT
diff --git a/iceauth.c b/iceauth.c
index 8730a82..b33cb38 100644
--- a/iceauth.c
+++ b/iceauth.c
@@ -52,7 +52,8 @@ static const char *defsource = "(stdin)";
/*
* utility routines
*/
-static void usage (void)
+static void _X_NORETURN
+usage (void)
{
static const char prefixmsg[] =
"\n"
diff --git a/process.c b/process.c
index dfefe8e..b87348b 100644
--- a/process.c
+++ b/process.c
@@ -89,8 +89,8 @@ static FILE *open_file ( char **filenamep, const char *mode, Bool *usedstdp, con
static int read_auth_entries ( FILE *fp, AuthList **headp, AuthList **tailp );
static int cvthexkey ( char *hexstr, char **ptrp );
static int dispatch_command ( const char *inputfilename, int lineno, int argc, char **argv, const CommandTable *tab, int *statusp );
-static void die ( int sig );
-static void catchsig ( int sig );
+static void die ( int sig ) _X_NORETURN;
+static void catchsig ( int sig ) _X_NORETURN;
static void register_signals ( void );
static int write_auth_file ( char *tmp_nam, size_t tmp_nam_len );
static void fprintfhex ( FILE *fp, unsigned int len, const char *cp );