|
@@ -1848,6 +1848,8 @@ my $prefix = '';
|
|
sub show_type {
|
|
sub show_type {
|
|
my ($type) = @_;
|
|
my ($type) = @_;
|
|
|
|
|
|
|
|
+ $type =~ tr/[a-z]/[A-Z]/;
|
|
|
|
+
|
|
return defined $use_type{$type} if (scalar keys %use_type > 0);
|
|
return defined $use_type{$type} if (scalar keys %use_type > 0);
|
|
|
|
|
|
return !defined $ignore_type{$type};
|
|
return !defined $ignore_type{$type};
|
|
@@ -5204,18 +5206,27 @@ sub process {
|
|
"Consecutive strings are generally better as a single string\n" . $herecurr);
|
|
"Consecutive strings are generally better as a single string\n" . $herecurr);
|
|
}
|
|
}
|
|
|
|
|
|
-# check for %L{u,d,i} and 0x%[udi] in strings
|
|
|
|
- my $string;
|
|
|
|
|
|
+# check for non-standard and hex prefixed decimal printf formats
|
|
|
|
+ my $show_L = 1; #don't show the same defect twice
|
|
|
|
+ my $show_Z = 1;
|
|
while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
|
|
while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
|
|
- $string = substr($rawline, $-[1], $+[1] - $-[1]);
|
|
|
|
|
|
+ my $string = substr($rawline, $-[1], $+[1] - $-[1]);
|
|
$string =~ s/%%/__/g;
|
|
$string =~ s/%%/__/g;
|
|
- if ($string =~ /(?<!%)%[\*\d\.\$]*L[udi]/) {
|
|
|
|
|
|
+ # check for %L
|
|
|
|
+ if ($show_L && $string =~ /%[\*\d\.\$]*L([diouxX])/) {
|
|
WARN("PRINTF_L",
|
|
WARN("PRINTF_L",
|
|
- "\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
|
|
|
|
- last;
|
|
|
|
- }
|
|
|
|
- if ($string =~ /0x%[\*\d\.\$\Llzth]*[udi]/) {
|
|
|
|
- ERROR("PRINTF_0xDECIMAL",
|
|
|
|
|
|
+ "\%L$1 is non-standard C, use %ll$1\n" . $herecurr);
|
|
|
|
+ $show_L = 0;
|
|
|
|
+ }
|
|
|
|
+ # check for %Z
|
|
|
|
+ if ($show_Z && $string =~ /%[\*\d\.\$]*Z([diouxX])/) {
|
|
|
|
+ WARN("PRINTF_Z",
|
|
|
|
+ "%Z$1 is non-standard C, use %z$1\n" . $herecurr);
|
|
|
|
+ $show_Z = 0;
|
|
|
|
+ }
|
|
|
|
+ # check for 0x<decimal>
|
|
|
|
+ if ($string =~ /0x%[\*\d\.\$\Llzth]*[diou]/) {
|
|
|
|
+ ERROR("PRINTF_0XDECIMAL",
|
|
"Prefixing 0x with decimal output is defective\n" . $herecurr);
|
|
"Prefixing 0x with decimal output is defective\n" . $herecurr);
|
|
}
|
|
}
|
|
}
|
|
}
|