[dm-devel] [PATCH] multipath-tools: refresh kernel-doc from kernel sources

Xose Vazquez Perez xose.vazquez at gmail.com
Sun Oct 7 12:14:53 UTC 2018


This one is missing.

On 8/18/18 10:38 PM, Xose Vazquez Perez wrote:
> Cc: Gris Ge <fge at redhat.com>
> Cc: Christophe Varoqui <christophe.varoqui at opensvc.com>
> Cc: DM-DEV ML <dm-devel at redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez at gmail.com>
> ---
>  libdmmp/docs/kernel-doc | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/libdmmp/docs/kernel-doc b/libdmmp/docs/kernel-doc
> index 0057d8e..8f0f508 100755
> --- a/libdmmp/docs/kernel-doc
> +++ b/libdmmp/docs/kernel-doc
> @@ -1062,7 +1062,7 @@ sub dump_struct($$) {
>      my $x = shift;
>      my $file = shift;
>  
> -    if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
> +    if ($x =~ /(struct|union)\s+(\w+)\s*\{(.*)\}/) {
>  	my $decl_type = $1;
>  	$declaration_name = $2;
>  	my $members = $3;
> @@ -1148,20 +1148,20 @@ sub dump_struct($$) {
>  				}
>  			}
>  		}
> -		$members =~ s/(struct|union)([^\{\};]+)\{([^\{\}]*)}([^\{\}\;]*)\;/$newmember/;
> +		$members =~ s/(struct|union)([^\{\};]+)\{([^\{\}]*)\}([^\{\}\;]*)\;/$newmember/;
>  	}
>  
>  	# Ignore other nested elements, like enums
> -	$members =~ s/({[^\{\}]*})//g;
> +	$members =~ s/(\{[^\{\}]*\})//g;
>  
>  	create_parameterlist($members, ';', $file, $declaration_name);
>  	check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual);
>  
>  	# Adjust declaration for better display
> -	$declaration =~ s/([{;])/$1\n/g;
> -	$declaration =~ s/}\s+;/};/g;
> +	$declaration =~ s/([\{;])/$1\n/g;
> +	$declaration =~ s/\}\s+;/};/g;
>  	# Better handle inlined enums
> -	do {} while ($declaration =~ s/(enum\s+{[^}]+),([^\n])/$1,\n$2/);
> +	do {} while ($declaration =~ s/(enum\s+\{[^\}]+),([^\n])/$1,\n$2/);
>  
>  	my @def_args = split /\n/, $declaration;
>  	my $level = 1;
> @@ -1171,12 +1171,12 @@ sub dump_struct($$) {
>  		$clause =~ s/\s+$//;
>  		$clause =~ s/\s+/ /;
>  		next if (!$clause);
> -		$level-- if ($clause =~ m/(})/ && $level > 1);
> +		$level-- if ($clause =~ m/(\})/ && $level > 1);
>  		if (!($clause =~ m/^\s*#/)) {
>  			$declaration .= "\t" x $level;
>  		}
>  		$declaration .= "\t" . $clause . "\n";
> -		$level++ if ($clause =~ m/({)/ && !($clause =~m/}/));
> +		$level++ if ($clause =~ m/(\{)/ && !($clause =~m/\}/));
>  	}
>  	output_declaration($declaration_name,
>  			   'struct',
> @@ -1244,7 +1244,7 @@ sub dump_enum($$) {
>      # strip #define macros inside enums
>      $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
>  
> -    if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
> +    if ($x =~ /enum\s+(\w+)\s*\{(.*)\}/) {
>  	$declaration_name = $1;
>  	my $members = $2;
>  	my %_members;
> @@ -1785,7 +1785,7 @@ sub process_proto_type($$) {
>      }
>  
>      while (1) {
> -	if ( $x =~ /([^{};]*)([{};])(.*)/ ) {
> +	if ( $x =~ /([^\{\};]*)([\{\};])(.*)/ ) {
>              if( length $prototype ) {
>                  $prototype .= " "
>              }
> 




More information about the dm-devel mailing list