Thread (25 messages) 25 messages, 4 authors, 2019-09-18

Re: [PATCH v6 11/12] lib/vsprintf: Add %pfw conversion specifier for printing fwnode names

From: Sakari Ailus <sakari.ailus@linux.intel.com>
Date: 2019-09-18 13:11:14
Also in: linux-acpi, lkml

Hi Joe,

On Tue, Sep 10, 2019 at 03:21:26AM -0700, Joe Perches wrote:
quoted
@@ -5988,14 +5988,17 @@ sub process {
 		        for (my $count = $linenr; $count <= $lc; $count++) {
 				my $specifier;
 				my $extension;
+				my $qualifier;
 				my $bad_specifier = "";
 				my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
 				$fmt =~ s/%%//g;
 
-				while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) {
+				while ($fmt =~ /(\%[\*\d\.]*p(\w)(\w?))/g) {
This is not generic enough to allow all possible qualifiers
to be captured.

This should be something like:

			while ($fmt =~ /(\%[\*\d\.]*p(\w)(\w*))/g) {
	
quoted
 					$specifier = $1;
 					$extension = $2;
-					if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxt]/) {
+					$qualifier = $3;
+					if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxtf]/ ||
+					    ($extension eq "f" && $qualifier ne "w")) {

And this should likely test
					    (defined $qualifier &&
					     $extension eq 'f' && $qualifier =~ /^w/))
quoted
 						$bad_specifier = $specifier;
 						last;
 					}
And here the 'f' isn't really a bad $specifier,
it does not have the correct 'w' $extension.

The valid extensions may change in the future and
this code isn't particularly manageable, so I
think the $specifier/$extension pair should likely
have some additional testing after validating
the $specifier.
There are certainly possibilities of having qualifiers that aren't
supported but extensions are also allowed to be followed by any other
characters, so this is a bit grey area.

I'll make the qualifier one or more letters for v7 as you suggested.

-- 
Regards,

Sakari Ailus
sakari.ailus@linux.intel.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help