Merge branch 'hotfix'

betty-doc.pl

@@ -2831,23 +2831,28 @@ ($)
 	    $_ .= <IN>;
 	}
 
-	if ($_ =~ /^(?:typedef\s+)?(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*\(?\**($Ident)\s*\(/s &&
+	my $attr = qr{__attribute__\s*\(\(\w+\)\)};
+
+	if ($_ =~ /^(?:typedef\s+)?(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*(?:$attr\s*)?\(?\**($Ident)\s*\(/s &&
 	    $_ !~ /;\s*$/)
 	{
 		# print STDOUT "Function found: $1\n";
 		if (!length $identifier || $identifier ne $1) {
 			print STDERR "${file}:$.: warning: no description found for function $1\n";
 			++$warnings;
 		}
-		elsif ($_ =~ /^(?:(?:$Storage|$Inline)\s*)*\s*($Type)\s*\(\**($Ident)\s*\((.*)\)\)\s*\(/s)
-		{
+		elsif ($_ =~ /^(?:(?:$Storage|$Inline)\s*)*\s*($Type)\s*\(\**($Ident)\s*\((.*)\)\)\s*\(/s) {
 			my $type_ = $1;
 			my $func_ = $2;
 			my $params_ = $3;
 			$_ = "${type_} *${func_} (${params_})\n";
 			# print "LINE:$_\n";
 			# print "FUNCTION -> ${type_} ${func_} (${params_})\n";
 		}
+		elsif ($_ =~ $attr) {
+			$_ =~ s/__attribute__\s*\(\(\w+\)\)//;
+			# print "LINE:$_\n";
+		}
 	}
 
 	if ($_ =~ /^\s*(?:typedef\s+)?(enum|union|struct)(?:\s+($Ident))?\s*.*/s &&

tests/doc/doc10.c

@@ -0,0 +1,23 @@
+/**
+ * first - Called before main
+ */
+void __attribute__((constructor)) first(void)
+{
+	printf("test\n");
+}
+
+/**
+ * first - Called before main
+ */
+void __attribute__ ((constructor)) first(void)
+{
+	printf("test\n");
+}
+
+/**
+ * first - Called before main
+ */
+void __attribute__((constructor))first(void)
+{
+	printf("test\n");
+}

tests/doc/doc10.expected.stdout

@@ -0,0 +1,3 @@
+first
+first
+first