From a067bc25bc5d83b5e10daabd6436090ac0df6c18 Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 12 Nov 2014 13:29:40 +0000 Subject: [PATCH] Let MSVC know about noreturn attribute to help with code analysis --- libnetutil/netutil.h | 3 +++ nbase/nbase_memalloc.c | 3 +++ ncat/util.h | 3 +++ nsock/src/error.h | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/libnetutil/netutil.h b/libnetutil/netutil.h index 609b61abc..58fe71286 100644 --- a/libnetutil/netutil.h +++ b/libnetutil/netutil.h @@ -162,6 +162,9 @@ struct abstract_ip_hdr { u32 ipid; /* IPv4 IP ID or IPv6 flow label. */ }; +#ifdef WIN32 +__declspec(noreturn) +#endif void netutil_fatal(const char *str, ...) __attribute__ ((noreturn)) __attribute__ ((format (printf, 1, 2))); diff --git a/nbase/nbase_memalloc.c b/nbase/nbase_memalloc.c index 4bf91f253..583d702e8 100644 --- a/nbase/nbase_memalloc.c +++ b/nbase/nbase_memalloc.c @@ -129,6 +129,9 @@ #include "nbase.h" #include +#ifdef WIN32 +__declspec(noreturn) +#endif static void fatal(char *fmt, ...) __attribute__ ((noreturn)) __attribute__ ((format (printf, 1, 2))); diff --git a/ncat/util.h b/ncat/util.h index f9bf2eb58..d162380f3 100644 --- a/ncat/util.h +++ b/ncat/util.h @@ -168,6 +168,9 @@ do { \ void die(char *); +#ifdef WIN32 +__declspec(noreturn) +#endif void bye(const char *, ...) __attribute__ ((noreturn)) __attribute__ ((format (printf, 1, 2))); diff --git a/nsock/src/error.h b/nsock/src/error.h index c00088759..0d29e063b 100644 --- a/nsock/src/error.h +++ b/nsock/src/error.h @@ -75,10 +75,16 @@ #endif +#ifdef WIN32 +__declspec(noreturn) +#endif void fatal(char *fmt, ...) __attribute__ ((noreturn)) __attribute__ ((format (printf, 1, 2))); +#ifdef WIN32 +__declspec(noreturn) +#endif void pfatal(char *fmt, ...) __attribute__ ((noreturn)) __attribute__ ((format (printf, 1, 2)));