Merge branch 'hotfix'

betty-style.pl

@@ -3833,21 +3833,6 @@ sub process {
 
 # check number of functions
 # and number of lines per function
-		if ($line =~ /(})/g) {
-			$inscope -= $#-;
-			if ($inscope == 0) {
-				$funclines = 0;
-			}
-		}
-
-		if ($inscope >= 1) {
-			$funclines++;
-			if ($funclines > $max_func_length) {
-				WARN("FUNCTIONS",
-				  "More than $max_func_length lines in a function\n");
-			}
-		}
-
 		if ($line =~ /({)/g) {
 			$inscope += $#-;
 			if ($prevline =~ /^(.(?:typedef\s*)?(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*(?:\b$Ident|\(\*\s*$Ident\))\s*)\(/s && $inscope == 1) {
@@ -3869,6 +3854,19 @@ sub process {
 				}
 			}
 		}
+		if ($line =~ /(})/g) {
+			$inscope -= $#-;
+		}
+
+		if ($inscope >= 1) {
+			$funclines++;
+			if ($funclines > $max_func_length + 1) {
+				WARN("FUNCTIONS",
+				  "More than $max_func_length lines in a function\n");
+			}
+		} else {
+			$funclines = 0;
+		}
 
 # open braces for enum, union and struct go on the same line.
 		# if ($line =~ /^.\s*{/ &&

tests/style/variables/variables1.c

@@ -0,0 +1,19 @@
+#include <stdio.h>
+
+int test;
+
+/**
+ * main - Entry point
+ *
+ * Return: Always 0 (Success)
+ */
+int main(void)
+{
+int i;
+	int j;
+	int arr = {1, 2, 3};
+	int k;
+
+	putchar('\n');
+	return (0);
+}

tests/style/variables/variables1.expected

@@ -0,0 +1,2 @@
+tests/style/variables/variables1.c:3: ERROR: global variables are not allowed
+total: 1 errors, 0 warnings, 19 lines checked