Fightwarn - the remainder of unreachable code warnings, and random small fixes

clients/upsimage.c

@@ -210,6 +210,17 @@ static void drawscale(
 }
 
 /* draws the bar style indicator */
+static void drawbar(
+	int lvllo, int lvlhi,			/* min and max numbers on the scale */
+	int step, int step5, int step10,	/* steps for minor, submajor and major dashes */
+	int redlo1, int redhi1,			/* first red zone start and end */
+	int redlo2, int redhi2,			/* second red zone start and end */
+	int grnlo, int grnhi,			/* green zone start and end */
+	double value, 				/* UPS variable value to draw */
+	const char *format			/* printf style format to be used when rendering summary text */
+)
+	__attribute__((noreturn));
+
 static void drawbar(
 	int lvllo, int lvlhi,			/* min and max numbers on the scale */
 	int step, int step5, int step10,	/* steps for minor, submajor and major dashes */
@@ -284,6 +295,9 @@ static void drawbar(
 }
 
 /* draws the error image */
+static void noimage(const char *fmt, ...)
+	__attribute__((noreturn));
+
 static void noimage(const char *fmt, ...)
 {
 	gdImagePtr	im;
@@ -331,13 +345,23 @@ static void noimage(const char *fmt, ...)
 
 	drawimage(im);
 
+	/* NOTE: Earlier code called noimage() and then exit(EXIT_FAILURE);
+	 * to signal an error via process exit code. Now that drawimage()
+	 * always ends with exit(EXIT_SUCCESS) - which might make webserver
+	 * feel good - the command-line use if any suffers no error returns.
+	 */
+
 	/* NOTREACHED */
 }
 
 /* draws bar indicator when minimum, nominal or maximum values for the given
    UPS variable can be determined.
    deviation < 0 means that values below nom should be grey instead of
    green */
+static void drawgeneralbar(double var, int min, int nom, int max,
+		int deviation, 	const char *format)
+	__attribute__((noreturn));
+
 static void drawgeneralbar(double var, int min, int nom, int max,
 		int deviation, 	const char *format)
 {
@@ -397,6 +421,10 @@ static void drawgeneralbar(double var, int min, int nom, int max,
 }
 
 /* draws input and output voltage bar style indicators */
+static void draw_utility(double var, int min, int nom, int max,
+		int deviation, const char *format)
+	__attribute__((noreturn));
+
 static void draw_utility(double var, int min, int nom, int max,
 		int deviation, const char *format)
 {
@@ -440,6 +468,10 @@ static void draw_utility(double var, int min, int nom, int max,
 }
 
 /* draws battery.percent bar style indicator */
+static void draw_battpct(double var, int min, int nom,
+		int max, int deviation, const char *format)
+	__attribute__((noreturn));
+
 static void draw_battpct(double var, int min, int nom,
 		int max, int deviation, const char *format)
 {
@@ -455,6 +487,10 @@ static void draw_battpct(double var, int min, int nom,
 }
 
 /* draws battery.voltage bar style indicator */
+static void draw_battvolt(double var, int min, int nom, int max,
+		int deviation, const char *format)
+	__attribute__((noreturn));
+
 static void draw_battvolt(double var, int min, int nom, int max,
 		int deviation, const char *format)
 {
@@ -501,6 +537,11 @@ static void draw_battvolt(double var, int min, int nom, int max,
 }
 
 /* draws ups.load bar style indicator */
+static void draw_upsload(double var, int min,
+		int nom, int max,
+		int deviation, const char *format)
+	__attribute__((noreturn));
+
 static void draw_upsload(double var, int min,
 		int nom, int max,
 		int deviation, const char *format)
@@ -514,6 +555,10 @@ static void draw_upsload(double var, int min,
 }
 
 /* draws temperature bar style indicator */
+static void draw_temperature(double var, int min, int nom, int max,
+		int deviation, const char *format)
+	__attribute__((noreturn));
+
 static void draw_temperature(double var, int min, int nom, int max,
 		int deviation, const char *format)
 {
@@ -526,6 +571,10 @@ static void draw_temperature(double var, int min, int nom, int max,
 }
 
 /* draws humidity bar style indicator */
+static void draw_humidity(double var, int min, int nom, int max,
+		int deviation, const char *format)
+	__attribute__((noreturn));
+
 static void draw_humidity(double var, int min, int nom, int max,
 		int deviation, const char *format)
 {
@@ -581,13 +630,17 @@ int main(int argc, char **argv)
 
 	if (upscli_splitname(monhost, &upsname, &hostname, &port) != 0) {
 		noimage("Invalid UPS definition (upsname[@hostname[:port]])\n");
-		exit(EXIT_FAILURE);
+#ifndef HAVE___ATTRIBUTE__NORETURN
+		exit(EXIT_FAILURE);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 	}
 
 	if (upscli_connect(&ups, hostname, port, 0) < 0) {
 		noimage("Can't connect to server:\n%s\n",
 			upscli_strerror(&ups));
-		exit(EXIT_FAILURE);
+#ifndef HAVE___ATTRIBUTE__NORETURN
+		exit(EXIT_FAILURE);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 	}
 
 	for (i = 0; imgvar[i].name; i++)
@@ -597,7 +650,9 @@ int main(int argc, char **argv)
 			   registered with this variable */
 			if (!imgvar[i].drawfunc) {
 				noimage("Draw function N/A");
-				exit(EXIT_FAILURE);
+#ifndef HAVE___ATTRIBUTE__NORETURN
+				exit(EXIT_FAILURE);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 			}
 
 			/* get the variable value */
@@ -608,7 +663,9 @@ int main(int argc, char **argv)
 				snprintf(str, sizeof(str), "%s N/A",
 					imgvar[i].name);
 				noimage(str);
-				exit(EXIT_FAILURE);
+#ifndef HAVE___ATTRIBUTE__NORETURN
+				exit(EXIT_FAILURE);	/* Should not get here in practice, but compiler is afraid we can fall through */
+#endif
 			}
 
 			/* when getting minimum, nominal and maximum values,
@@ -661,7 +718,9 @@ int main(int argc, char **argv)
 		}
 
 	noimage("Unknown display");
+#ifndef HAVE___ATTRIBUTE__NORETURN
 	exit(EXIT_FAILURE);
+#endif
 }
 
 imgvar_t imgvar[] = {

clients/upsmon.c

@@ -630,6 +630,9 @@ static void slavesync(void)
 	}
 }
 
+static void forceshutdown(void)
+	__attribute__((noreturn));
+
 static void forceshutdown(void)
 {
 	utype_t	*ups;

common/common.c

@@ -21,6 +21,7 @@
 
 #include <ctype.h>
 #include <syslog.h>
+#include <errno.h>
 #include <pwd.h>
 #include <grp.h>
 #include <dirent.h>
@@ -301,7 +302,11 @@ int snprintfcat(char *dst, size_t size, const char *fmt, ...)
 	int ret;
 
 	size--;
-	assert(len <= size);
+	if (len > size) {
+		/* Do not truncate existing string */
+		errno = ERANGE;
+		return -1;
+	}
 
 	va_start(ap, fmt);
 #ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_FORMAT_NONLITERAL
@@ -327,9 +332,14 @@ int snprintfcat(char *dst, size_t size, const char *fmt, ...)
 	 * In theory it can overflow a 64-vs-32 bit range, or signed-vs-unsigned.
 	 * In practice we hope to not have gigabytes-long config strings.
 	 */
-	assert(ret >= 0);
+	if (ret < 0) {
+		return ret;
+	}
 #ifdef INT_MAX
-	assert ((unsigned long long)len < ((unsigned long long)INT_MAX - ret));
+	if ( ( (unsigned long long)len + (unsigned long long)ret ) >= (unsigned long long)INT_MAX ) {
+		errno = ERANGE;
+		return -1;
+	}
 #endif
 	return (int)len + ret;
 }

common/str.c

@@ -252,7 +252,7 @@ int	str_to_short(const char *string, short *number, const int base)
 		return 0;
 	}
 
-	*number = num;
+	*number = (short)num;
 	return 1;
 }
 
@@ -273,7 +273,7 @@ int	str_to_short_strict(const char *string, short *number, const int base)
 		return 0;
 	}
 
-	*number = num;
+	*number = (short)num;
 	return 1;
 }
 
@@ -291,7 +291,7 @@ int	str_to_ushort(const char *string, unsigned short *number, const int base)
 		return 0;
 	}
 
-	*number = num;
+	*number = (unsigned short)num;
 	return 1;
 }
 
@@ -309,7 +309,7 @@ int	str_to_ushort_strict(const char *string, unsigned short *number, const int b
 		return 0;
 	}
 
-	*number = num;
+	*number = (unsigned short)num;
 	return 1;
 }
 

common/strerror.c

@@ -11,6 +11,16 @@ char *strerror(int errnum)
 {
     static char buf[32];
 
+#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_UNREACHABLE_CODE
+#pragma GCC diagnostic push
+#endif
+#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_UNREACHABLE_CODE_BREAK
+#pragma GCC diagnostic ignored "-Wunreachable-code-break"
+#endif
+#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_UNREACHABLE_CODE
+#pragma GCC diagnostic ignored "-Wunreachable-code"
+#endif
+
     switch (errnum) {
 #if defined (EPERM)
       case EPERM:
@@ -498,6 +508,11 @@ char *strerror(int errnum)
     /* Fallback: just print the error number */
     snprintf(buf, sizeof(buf), "Error %d", errnum);
     return buf;
+
+#ifdef HAVE_PRAGMAS_FOR_GCC_DIAGNOSTIC_IGNORED_UNREACHABLE_CODE
+#pragma GCC diagnostic pop
+#endif
+
 }
 
 #endif /* HAVE_STRERROR */

common/upsconf.c

@@ -29,7 +29,7 @@
 	static	char	*ups_section;
 
 /* handle arguments separated by parseconf */
-static void conf_args(int numargs, char **arg)
+static void conf_args(size_t numargs, char **arg)
 {
 	if (numargs < 1)
 		return;

drivers/al175.c

@@ -191,7 +191,7 @@ typedef struct {
 /**
  * convert hex string to int
  * @param  head  input string
- * @param  count string length
+ * @param  len   string length
  * @return parsed value (>=0) if success, -1 on error
  */
 static long from_hex(const byte_t *head, unsigned len)
@@ -1000,23 +1000,23 @@ typedef int VV_t;	/* voltage */
 #define	ACT int
 
 /* Declare to keep compiler happy even if some routines below are not used currently */
-ACT	TOGGLE_PRS_ONOFF	();
-ACT	CANCEL_BOOST		();
-ACT	STOP_BATTERY_TEST	();
+ACT	TOGGLE_PRS_ONOFF	(void);
+ACT	CANCEL_BOOST		(void);
+ACT	STOP_BATTERY_TEST	(void);
 ACT	START_BATTERY_TEST	(VV_t EndVolt, unsigned Minutes);
 ACT	SET_FLOAT_VOLTAGE	(VV_t v);
 ACT	SET_BOOST_VOLTAGE	(VV_t v);
 ACT	SET_HIGH_BATTERY_LIMIT	(VV_t Vhigh);
 ACT	SET_LOW_BATTERY_LIMIT	(VV_t Vlow);
 ACT	SET_DISCONNECT_LEVEL_AND_DELAY	(VV_t level, mm_t delay);
-ACT	RESET_ALARMS		();
-ACT	CHANGE_COMM_PROTOCOL	();
+ACT	RESET_ALARMS		(void);
+ACT	CHANGE_COMM_PROTOCOL	(void);
 ACT	SET_VOLTAGE_AT_ZERO_T	(VV_t v);
 ACT	SET_SLOPE_AT_ZERO_T	(VV_t mv_per_degree);
 ACT	SET_MAX_TCOMP_VOLTAGE	(VV_t v);
 ACT	SET_MIN_TCOMP_VOLTAGE	(VV_t v);
 ACT	SWITCH_TEMP_COMP	(int on);
-ACT	SWITCH_SYM_ALARM	();
+ACT	SWITCH_SYM_ALARM	(void);
 
 /* Implement */
 ACT	TOGGLE_PRS_ONOFF	()		{ return al175_do(0x81, 0x80			Z3);	}
@@ -1229,6 +1229,9 @@ void upsdrv_updateinfo(void)
 
 }
 
+void upsdrv_shutdown(void)
+	__attribute__((noreturn));
+
 void upsdrv_shutdown(void)
 {
 	/* TODO use TOGGLE_PRS_ONOFF for shutdown */