Fix clang-tidy warningsHEADmaster

3 files changed, 12 insertions, 8 deletions

diff --git a/.clang-tidy b/.clang-tidy
index d0068b6..f75dec1 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,readability-*,modernize-*,bugprone-*,misc-*,-misc-unused-parameters,google-runtime-int,-llvm-header-guard,fuchsia-restrict-system-includes,-clang-analyzer-valist.Uninitialized,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-alpha.*,-readability-magic-numbers,-readability-braces-around-statements,-readability-function-cognitive-complexity,-readability-isolate-declaration,-readability-identifier-length,-bugprone-easily-swappable-parameters,-modernize-macro-to-enum'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,readability-*,modernize-*,bugprone-*,misc-*,-misc-unused-parameters,google-runtime-int,-llvm-header-guard,fuchsia-restrict-system-includes,-clang-analyzer-valist.Uninitialized,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-alpha.*,-misc-include-cleaner,-readability-magic-numbers,-readability-braces-around-statements,-readability-function-cognitive-complexity,-readability-isolate-declaration,-readability-identifier-length,-bugprone-easily-swappable-parameters,-modernize-macro-to-enum'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*(?<!lookup3.c)$'
 FormatStyle: 'file'
diff --git a/inc/dslib.h b/inc/dslib.h
index 1764219..81ea573 100644
--- a/inc/dslib.h
+++ b/inc/dslib.h
@@ -124,7 +124,7 @@ static void cleanqueue(queue **front)
 	}
 }
 
-#if 0
+/*
 static void printstack(stack *top)
 {
 	stack *i;
@@ -154,4 +154,4 @@ static void printqueue(queue *front)
 
 	printf("\n");
 }
-#endif
+*/
diff --git a/src/bcal.c b/src/bcal.c
index 9ca8b06..b828c89 100644
--- a/src/bcal.c
+++ b/src/bcal.c
@@ -1333,6 +1333,7 @@ static int priority(char sign) /* Get the priority of operators, higher priprity
 	case '%':
 	case '/':
 	case '*': return 6;
+	default : return 0;
 	}
 
 	return 0;
@@ -1553,6 +1554,8 @@ static maxuint_t eval(queue **front, queue **rear, int *out)
 					case '^':
 						c = a ^ b;
 						break;
+					default:
+						break;
 					}
 
 					if (raw_a.unit)
@@ -1624,7 +1627,8 @@ static maxuint_t eval(queue **front, queue **rear, int *out)
 					break;
 				}
 
-				log(ERROR, "unit mismatch in modulo\n");
+				log(ERROR, "unit mismatch in modulo\n"); // fallthrough
+			default:
 				goto error;
 			}
 
@@ -1701,8 +1705,8 @@ static int isoperator(int c)
 	}
 }
 
-#if 0
 /* Check if valid storage arithmetic expression */
+/*
 static int checkexp(char *exp)
 {
 	while (*exp) {
@@ -1714,7 +1718,7 @@ static int checkexp(char *exp)
 
 	return 0;
 }
-#endif
+*/
 
 /* Trim ending newline and whitespace from both ends, in place */
 static void strstrip(char *s)
@@ -1772,13 +1776,13 @@ static char *fixexpr(char *exp, int *unitless)
 	strstrip(exp);
 	removeinnerspaces(exp);
 
-#if 0
+	/*
 	if (!checkexp(exp)) {
 		log(DEBUG, "no unit in expression [%s]\n", exp);
 		*unitless = 1;
 		return NULL;
 	}
-#endif
+	*/
 
 	int i = 0, j = 0;
 	char *parsed = (char *)calloc(1, 2 * strlen(exp) * sizeof(char));