Fightwarn - macos llvm - noreturn

.gitignore

@@ -24,6 +24,7 @@ Makefile.in
 /configure
 /conf_nut_report_feature
 /conf??????/
+/dir.??????/
 /cscope.*
 /depcomp
 /INSTALL

clients/upsc.c

@@ -229,7 +229,9 @@ int main(int argc, char **argv)
 
 		case 'V':
 			fatalx(EXIT_SUCCESS, "Network UPS Tools upscmd %s", UPS_VERSION);
+#ifndef HAVE___ATTRIBUTE__NORETURN
 			exit(EXIT_SUCCESS);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 
 		case 'h':
 		default:

clients/upscmd.c

@@ -257,7 +257,9 @@ int main(int argc, char **argv)
 
 		case 'V':
 			fatalx(EXIT_SUCCESS, "Network UPS Tools upscmd %s", UPS_VERSION);
+#ifndef HAVE___ATTRIBUTE__NORETURN
 			exit(EXIT_SUCCESS);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 
 		case 'h':
 		default:

clients/upsimage.c

@@ -111,6 +111,9 @@ static int get_imgarg(const char *name)
 }
 
 /* write the HTML header then have gd dump the image */
+static void drawimage(gdImagePtr im)
+	__attribute__((noreturn));
+
 static void drawimage(gdImagePtr im)
 {
 	printf("Pragma: no-cache\n");

clients/upslog.c

@@ -110,6 +110,9 @@ static void setup_signals(void)
 		fatal_with_errno(EXIT_FAILURE, "Can't install SIGUSR1 handler");
 }
 
+static void help(const char *prog)
+	__attribute__((noreturn));
+
 static void help(const char *prog)
 {
 	printf("UPS status logger.\n");
@@ -403,7 +406,9 @@ int main(int argc, char **argv)
 		switch(i) {
 			case 'h':
 				help(prog);
+#ifndef HAVE___ATTRIBUTE__NORETURN
 				break;
+#endif
 
 			case 's':
 				monhost = optarg;

clients/upsmon.c

@@ -418,6 +418,9 @@ static void set_pdflag(void)
 }
 
 /* the actual shutdown procedure */
+static void doshutdown(void)
+	__attribute__((noreturn));
+
 static void doshutdown(void)
 {
 	int	ret;
@@ -1671,11 +1674,14 @@ static int check_pdflag(void)
 	return EXIT_SUCCESS;
 }
 
-static void help(const char *progname)
+static void help(const char *arg_progname)
+	__attribute__((noreturn));
+
+static void help(const char *arg_progname)
 {
 	printf("Monitors UPS servers and may initiate shutdown if necessary.\n\n");
 
-	printf("usage: %s [OPTIONS]\n\n", progname);
+	printf("usage: %s [OPTIONS]\n\n", arg_progname);
 	printf("  -c <cmd>	send command to running process\n");
 	printf("		commands:\n");
 	printf("		 - fsd: shutdown all master UPSes (use with caution)\n");
@@ -1692,6 +1698,9 @@ static void help(const char *progname)
 	exit(EXIT_SUCCESS);
 }
 
+static void runparent(int fd)
+	__attribute__((noreturn));
+
 static void runparent(int fd)
 {
 	int	ret;
@@ -1747,7 +1756,9 @@ static void start_pipe(void)
 		close(pipefd[1]);
 		runparent(pipefd[0]);
 
+#ifndef HAVE___ATTRIBUTE__NORETURN
 		exit(EXIT_FAILURE);	/* NOTREACHED */
+#endif
 	}
 
 	close(pipefd[0]);
@@ -1933,7 +1944,9 @@ int main(int argc, char *argv[])
 				break;
 			case 'h':
 				help(argv[0]);
+#ifndef HAVE___ATTRIBUTE__NORETURN
 				break;
+#endif
 			case 'K':
 				checking_flag = 1;
 				break;
@@ -1955,7 +1968,9 @@ int main(int argc, char *argv[])
 				break;
 			default:
 				help(argv[0]);
+#ifndef HAVE___ATTRIBUTE__NORETURN
 				break;
+#endif
 		}
 	}
 

clients/upsset.c

@@ -253,6 +253,10 @@ static void do_pickups(const char *currfunc)
 	printf("</FORM>\n");
 }
 
+static void error_page(const char *next, const char *title,
+	const char *fmt, ...)
+	__attribute__((noreturn));
+
 static void error_page(const char *next, const char *title,
 	const char *fmt, ...)
 {
@@ -282,6 +286,9 @@ static void error_page(const char *next, const char *title,
 	exit(EXIT_SUCCESS);
 }
 
+static void loginscreen(void)
+	__attribute__((noreturn));
+
 static void loginscreen(void)
 {
 	do_header("Login");
@@ -506,6 +513,9 @@ static void send_auth(const char *next)
 			"Password set failed: %s", upscli_strerror(&ups));
 }
 
+static void docmd(void)
+	__attribute__((noreturn));
+
 static void docmd(void)
 {
 	char	buf[SMALLBUF], *desc;
@@ -768,6 +778,9 @@ static void print_rw(const char *upsname, const char *varname)
 	printf("</TR>\n");
 }
 
+static void showsettings(void)
+	__attribute__((noreturn));
+
 static void showsettings(void)
 {
 	int	ret;
@@ -910,6 +923,9 @@ static int setvar(const char *var, const char *val)
 }
 
 /* turn a form submission of settings into SET commands for upsd */
+static void savesettings(void)
+	__attribute__((noreturn));
+
 static void savesettings(void)
 {
 	int	changed = 0;
@@ -956,6 +972,9 @@ static void savesettings(void)
 	exit(EXIT_SUCCESS);
 }
 
+static void initial_pickups(void)
+	__attribute__((noreturn));
+
 static void initial_pickups(void)
 {
 	do_header("Select a UPS");

common/parseconf.c

@@ -76,6 +76,8 @@
  *
  */
 
+#include "common.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
@@ -86,6 +88,7 @@
 #include <fcntl.h>
 
 #include "parseconf.h"
+#include "attribute.h"
 
 /* possible states */
 
@@ -98,6 +101,9 @@
 #define STATE_ENDOFLINE		7
 #define STATE_PARSEERR		8
 
+static void pconf_fatal(PCONF_CTX_t *ctx, const char *errtxt)
+	__attribute__((noreturn));
+
 static void pconf_fatal(PCONF_CTX_t *ctx, const char *errtxt)
 {
 	if (ctx->errhandler)

configure.ac

@@ -138,6 +138,7 @@ AC_C_BIGENDIAN
 AC_C_INLINE
 AC_C_FLEXIBLE_ARRAY_MEMBER
 AC_C_VARARRAYS
+AX_C___ATTRIBUTE__
 AC_CHECK_FUNCS(flock lockf fcvt fcvtl pow10 round abs_val abs)
 AC_CHECK_FUNCS(fabs, [], [], [#include <math.h>])
 AC_CHECK_FUNCS(cfsetispeed tcsendbreak)

drivers/apcupsd-ups.c

@@ -16,6 +16,8 @@
 
 */
 
+#include "config.h"
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -24,6 +26,7 @@
 
 #include "main.h"
 #include "apcupsd-ups.h"
+#include "attribute.h"
 
 #define DRIVER_NAME	"apcupsd network client UPS driver"
 #define DRIVER_VERSION	"0.5"
@@ -257,6 +260,9 @@ void upsdrv_updateinfo(void)
 	poll_interval = (poll_interval > POLL_INTERVAL_MIN) ? POLL_INTERVAL_MIN : poll_interval;
 }
 
+void upsdrv_shutdown(void)
+	__attribute__((noreturn));
+
 void upsdrv_shutdown(void)
 {
 	fatalx(EXIT_FAILURE, "shutdown not supported");

drivers/bcmxcp_usb.c

@@ -195,7 +195,7 @@ int get_answer(unsigned char *data, unsigned char command)
 		}
 
 		if (need_data > 0) /* We need more data */
-		    continue;
+			continue;
 
 		/* Now validate XCP frame */
 		/* Check header */
@@ -204,7 +204,7 @@ int get_answer(unsigned char *data, unsigned char command)
 			/* Sometime we read something wrong. bad cables? bad ports? */
 			my_buf = memchr(my_buf, PW_COMMAND_START_BYTE, bytes_read);
 			if (!my_buf)
-			    return -1;
+				return -1;
 		}
 
 		/* Read block number byte */
@@ -263,9 +263,9 @@ int get_answer(unsigned char *data, unsigned char command)
 		end_length += length;
 		tail = bytes_read - (length + PW_HEADER_SIZE);
 		if (tail > 0)
-		    my_buf = memmove(&buf[0], my_buf + length + PW_HEADER_SIZE, tail);
+			my_buf = memmove(&buf[0], my_buf + length + PW_HEADER_SIZE, tail);
 		else if (tail == 0)
-		    my_buf = &buf[0];
+			my_buf = &buf[0];
 		bytes_read = tail;
 	}
 
@@ -345,6 +345,9 @@ void upsdrv_reconnect(void)
 }
 
 /* USB functions */
+static void nutusb_open_error(const char *port)
+	__attribute__((noreturn));
+
 static void nutusb_open_error(const char *port)
 {
 	printf("Unable to find POWERWARE UPS device on USB bus (%s)\n\n", port);
@@ -432,7 +435,7 @@ usb_dev_handle *nutusb_open(const char *port)
 			{
 				upsdebugx(1, "Can't reset POWERWARE USB endpoint: %s", usb_strerror());
 				if (dev_claimed)
-				    usb_release_interface(dev_h, 0);
+					usb_release_interface(dev_h, 0);
 				usb_reset(dev_h);
 				sleep(5);	/* Wait reconnect */
 				errout = 1;

drivers/blazer.c

@@ -808,6 +808,8 @@ void upsdrv_updateinfo(void)
 	dstate_dataok();
 }
 
+void upsdrv_shutdown(void)
+	__attribute__((noreturn));
 
 void upsdrv_shutdown(void)
 {

drivers/blazer_usb.c

@@ -435,11 +435,15 @@ int blazer_command(const char *cmd, char *buf, size_t buflen)
 	{
 	case -EBUSY:		/* Device or resource busy */
 		fatal_with_errno(EXIT_FAILURE, "Got disconnected by another driver");
+#ifndef HAVE___ATTRIBUTE__NORETURN
 		exit(EXIT_FAILURE);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 
 	case -EPERM:		/* Operation not permitted */
 		fatal_with_errno(EXIT_FAILURE, "Permissions problem");
+#ifndef HAVE___ATTRIBUTE__NORETURN
 		exit(EXIT_FAILURE);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 
 	case -EPIPE:		/* Broken pipe */
 		if (usb_clear_halt(udev, 0x81) == 0) {

drivers/clone.c

@@ -18,8 +18,10 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+#include "config.h"
 #include "main.h"
 #include "parseconf.h"
+#include "attribute.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -520,6 +522,9 @@ void upsdrv_updateinfo(void)
 }
 
 
+void upsdrv_shutdown(void)
+	__attribute__((noreturn));
+
 void upsdrv_shutdown(void)
 {
 	fatalx(EXIT_FAILURE, "shutdown not supported");

drivers/dstate.c

@@ -32,6 +32,7 @@
 #include "dstate.h"
 #include "state.h"
 #include "parseconf.h"
+#include "attribute.h"
 
 	static int	sockfd = -1, stale = 1, alarm_active = 0, ignorelb = 0;
 	static char	*sockfn = NULL;
@@ -43,6 +44,9 @@
 	struct ups_handler	upsh;
 
 /* this may be a frequent stumbling point for new users, so be verbose here */
+static void sock_fail(const char *fn)
+	__attribute__((noreturn));
+
 static void sock_fail(const char *fn)
 {
 	int	sockerr;

drivers/dummy-ups.c

@@ -139,10 +139,9 @@ void upsdrv_initinfo(void)
 			}
 			/* FIXME: commands and settable variable! */
 			break;
-		default:
 		case MODE_NONE:
+		default:
 			fatalx(EXIT_FAILURE, "no suitable definition found!");
-			break;
 	}
 	upsh.instcmd = instcmd;
 
@@ -188,6 +187,9 @@ void upsdrv_updateinfo(void)
 	}
 }
 
+void upsdrv_shutdown(void)
+	__attribute__((noreturn));
+
 void upsdrv_shutdown(void)
 {
 	fatalx(EXIT_FAILURE, "shutdown not supported");