summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-06 18:44:47 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-06 18:56:57 -0700
commit4b8da0a0a296dce4ead1baac4a39ac27dee144da (patch)
treedad0eb0fde9f3c81d461e08859d6cd9ee4697ff5
parent45909ffe71788d80b2dabff886341b44c10a096d (diff)
Mark fatal() & Syntax() with printf & noreturn attributes
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--xrdb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 858652c..381c499 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ CPP_PATH=`echo ${CPP_PATH} | sed 's/,/\\",\\"/g'`
AC_DEFINE_UNQUOTED([CPP], "$CPP_PATH", [Path to CPP program])
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XRDB, xmuu x11)
+PKG_CHECK_MODULES(XRDB, [xmuu x11 xproto >= 7.0.17])
AC_CONFIG_FILES([
Makefile
diff --git a/xrdb.c b/xrdb.c
index ba8440d..3bf5c25 100644
--- a/xrdb.c
+++ b/xrdb.c
@@ -140,7 +140,7 @@ static Display *dpy;
static Buffer buffer;
static Entries newDB;
-static void fatal(const char *, ...);
+static void fatal(const char *, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
static void addstring ( String *arg, const char *s );
static void addescapedstring ( String *arg, const char *s );
static void addtokstring ( String *arg, const char *s );
@@ -729,7 +729,7 @@ cleanup:
}
}
-static void
+static void _X_NORETURN
Syntax (void)
{
fprintf (stderr,