add macro name check to helper.pl

karel-m · sjaeckel · commit 89d991e9461e · 2020-07-14T18:44:23.000+02:00
diff --git a/helper.pl b/helper.pl
@@ -68,6 +68,12 @@ sub check_source {
           $l =~ /^static(\s+[a-zA-Z0-9_]+)+\s+([^_][a-zA-Z0-9_]+)\s*\(/) {
         push @{$troubles->{staticfunc_name}}, "$lineno($2)";
       }
+      if ($file =~ m|src/.*\.[ch]$| && $l =~ /^\s*#\s*define\s+(_[A-Z_][a-zA-Z0-9_]*)\b/) {
+        my $n = $1;
+        push @{$troubles->{invalid_macro_name}}, "$lineno($n)"
+                unless ($file eq 'src/headers/tomcrypt_cfg.h' &&  $n eq '__has_builtin') ||
+                       ($file eq 'src/prngs/rng_get_bytes.c' &&  $n eq '_WIN32_WINNT');
+      }
       $lineno++;
     }
     for my $k (sort keys %$troubles) {

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,12 @@ sub check_source {`
`68`	`68`	`$l =~ /^static(\s+[a-zA-Z0-9_]+)+\s+([^_][a-zA-Z0-9_]+)\s*\(/) {`
`69`	`69`	`push @{$troubles->{staticfunc_name}}, "$lineno($2)";`
`70`	`70`	`}`
	`71`	`+ if ($file =~ m\|src/.\.[ch]$\| && $l =~ /^\s#\sdefine\s+(_[A-Z_][a-zA-Z0-9_])\b/) {`
	`72`	`+ my $n = $1;`
	`73`	`+ push @{$troubles->{invalid_macro_name}}, "$lineno($n)"`
	`74`	`+ unless ($file eq 'src/headers/tomcrypt_cfg.h' && $n eq '__has_builtin') \|\|`
	`75`	`+ ($file eq 'src/prngs/rng_get_bytes.c' && $n eq '_WIN32_WINNT');`
	`76`	`+ }`
`71`	`77`	`$lineno++;`
`72`	`78`	`}`
`73`	`79`	`for my $k (sort keys %$troubles) {`