Merge branch 'hotfix'

juniorohanyere · Nov 23, 2016 · bcc0a07 · bcc0a07
2 parents cbd6cb1 + 4163230
commit bcc0a07
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/betty-doc.pl b/betty-doc.pl
@@ -2436,7 +2436,7 @@ ($$)
         $noret = 1;
     } elsif ($prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
 	$prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
-	$prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
+	$prototype =~ m/^(\w+\s*\*)\s*(?:\**\s*)?([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
 	$prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
 	$prototype =~ m/^(\w+\s+\w+\s*\*+)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||
 	$prototype =~ m/^(\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ ||

diff --git a/betty-style.pl b/betty-style.pl
@@ -3833,6 +3833,9 @@ sub process {
 # and number of lines per function
 		if ($line =~ /.*}.*/) {
 			$inscope--;
+			if ($inscope == 0) {
+				$funclines = 0;
+			}
 		}
 
 		if ($inscope >= 1) {

diff --git a/tests/doc/doc9.c b/tests/doc/doc9.c
@@ -59,3 +59,15 @@ int (*get_op_func(char *s)) (int, int)
 	}
 	return (NULL);
 }
+
+/**
+ * get_valid_type - Test
+ *
+ * @s: Test
+ *
+ * Return: Test
+ */
+char *(*get_valid_type(char s))(void)
+{
+	return (NULL);
+}
diff --git a/tests/doc/doc9.expected.stdout b/tests/doc/doc9.expected.stdout
@@ -1,2 +1,3 @@
 get_op_func
 get_op_func
+get_valid_type