From 4afc641fdd8c03bd708f50e0c3691b5de7ea1dba Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 Jul 2017 13:35:57 +0200 Subject: nxcomp: Add __attribute__((noreturn)) to more functions where appropriate. --- nxcomp/src/Channel.h | 2 +- nxcomp/src/Jpeg.cpp | 2 +- nxcomp/src/Transport.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nxcomp/src/Channel.h b/nxcomp/src/Channel.h index 93b022630..7e432416a 100644 --- a/nxcomp/src/Channel.h +++ b/nxcomp/src/Channel.h @@ -519,7 +519,7 @@ class Channel // Set up the split stores. // - void handleSplitStoreError(int resource); + void handleSplitStoreError(int resource) __attribute__((noreturn)); void handleSplitStoreAlloc(List *list, int resource); void handleSplitStoreRemove(List *list, int resource); diff --git a/nxcomp/src/Jpeg.cpp b/nxcomp/src/Jpeg.cpp index 64a537497..2e8044049 100644 --- a/nxcomp/src/Jpeg.cpp +++ b/nxcomp/src/Jpeg.cpp @@ -106,7 +106,7 @@ static int DecompressJpeg24(unsigned char *compressedData, int compressedLen, static int DecompressJpeg32(unsigned char *compressedData, int compressedLen, unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder); -void UnpackJpegErrorHandler(j_common_ptr cinfo); +void UnpackJpegErrorHandler(j_common_ptr cinfo) __attribute__((noreturn)); // // Colormap stuff. diff --git a/nxcomp/src/Transport.h b/nxcomp/src/Transport.h index 047396af6..4ae0e3c25 100644 --- a/nxcomp/src/Transport.h +++ b/nxcomp/src/Transport.h @@ -413,9 +413,9 @@ class AgentTransport : public Transport // These two should never be called. // - virtual int flush(); + virtual int flush() __attribute__((noreturn)); - virtual int drain(int limit, int timeout); + virtual int drain(int limit, int timeout) __attribute((noreturn)); // // Same as in the base class. -- cgit v1.2.3