diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-28 17:11:05 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-28 17:15:09 -0700 |
| commit | b39bb910ce7a8dc18922957bad7c0e7b1fe9c499 (patch) | |
| tree | 59ba2d14c34f64bb9c58a54e8cbd8b197589b8b1 | |
| parent | 8607b9de7b331f7a97e623b1490194324a8b9a4b (diff) | |
Annotate fatal errors with _X_NORETURN
Fixes a false-positive with clang static analysis
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/FSlibint.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index a3f0a04..119328e 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ XORG_DEFAULT_OPTIONS XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(FS, xproto fontsproto xtrans) +PKG_CHECK_MODULES(FS, xproto >= 7.0.17 fontsproto xtrans) # Find needed libraries for TCP sockets (pre-pended in $LIBS) XTRANS_CONNECTION_FLAGS diff --git a/src/FSlibint.h b/src/FSlibint.h index 5e9cf51..0a0ce41 100644 --- a/src/FSlibint.h +++ b/src/FSlibint.h @@ -61,7 +61,7 @@ in this Software without prior written authorization from The Open Group. #include <errno.h> #include <stddef.h> -typedef int (* FSIOErrorHandler)(FSServer *); +typedef int (* FSIOErrorHandler)(FSServer *) _X_NORETURN; typedef int (* FSErrorHandler)(FSServer *, FSErrorEvent *); extern FSIOErrorHandler _FSIOErrorFunction; @@ -89,7 +89,7 @@ extern int _FSUnknownWireEvent ( FSServer *svr, FSEvent *re, fsEvent *event ); extern int _FSUnknownNativeEvent ( FSServer *svr, FSEvent *re, fsEvent *event ); extern int _FSWireToEvent ( FSServer *svr, FSEvent *re, fsEvent *event ); -extern int _FSDefaultIOError ( FSServer *svr ); +extern int _FSDefaultIOError ( FSServer *svr ) _X_NORETURN; extern int _FSPrintDefaultError ( FSServer *svr, FSErrorEvent *event, FILE *fp ); extern int _FSDefaultError ( FSServer *svr, FSErrorEvent *event ); |