Skip to content

W
wine-cw
Commit 11a7b29a authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

Declare DO_DUMP_FUNC() before calling it and call normally so that

perl can check its prototype.
parent 0218e0af
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
tools/make_requests
View file @ 11a7b29a
...@@ -49,6 +49,48 @@ my @trace_lines = (); ...@@ -49,6 +49,48 @@ my @trace_lines = ();
### Generate a dumping function
sub DO_DUMP_FUNC($$@)
{
my $name = shift;
my $req = shift;
push @trace_lines, "static void dump_${name}_$req( const struct ${name}_$req *req )\n{\n";
while ($#_ >= 0)
{
my $type = shift;
my $var = shift;
if (defined($formats{$type}))
{
if ($formats{$type} =~ /^&(.*)/)
{
my $func = $1;
push @trace_lines, " fprintf( stderr, \" $var=\" );\n";
push @trace_lines, " $func( &req->$var );\n";
push @trace_lines, " fprintf( stderr, \",\" );\n" if ($#_ > 0);
}
else
{
push @trace_lines, " fprintf( stderr, \" $var=$formats{$type}";
push @trace_lines, "," if ($#_ > 0);
push @trace_lines, "\", ";
# In the case of time_t we need to cast the parameter to
# long to match the associated "%ld" printf modifier.
push @trace_lines, "(long)" if( $type eq "time_t" );
push @trace_lines, "req->$var );\n";
}
}
else # must be some varargs format
{
my $func = $type;
push @trace_lines, " fprintf( stderr, \" $var=\" );\n";
push @trace_lines, " $func;\n";
push @trace_lines, " fputc( ',', stderr );\n" if ($#_ > 0);
}
}
push @trace_lines, "}\n\n";
}
### Parse the request definitions ### Parse the request definitions
sub PARSE_REQUESTS() sub PARSE_REQUESTS()
...@@ -116,11 +158,11 @@ sub PARSE_REQUESTS() ...@@ -116,11 +158,11 @@ sub PARSE_REQUESTS()
# got a complete request # got a complete request
push @requests, $name; push @requests, $name;
&DO_DUMP_FUNC( $name, "request", @in_struct); DO_DUMP_FUNC( $name, "request", @in_struct);
if ($#out_struct >= 0) if ($#out_struct >= 0)
{ {
$replies{$name} = 1; $replies{$name} = 1;
&DO_DUMP_FUNC( $name, "reply", @out_struct); DO_DUMP_FUNC( $name, "reply", @out_struct);
} }
$state = 1; $state = 1;
next; next;
...@@ -167,48 +209,6 @@ sub PARSE_REQUESTS() ...@@ -167,48 +209,6 @@ sub PARSE_REQUESTS()
close PROTOCOL; close PROTOCOL;
} }
### Generate a dumping function
sub DO_DUMP_FUNC($$@)
{
my $name = shift;
my $req = shift;
push @trace_lines, "static void dump_${name}_$req( const struct ${name}_$req *req )\n{\n";
while ($#_ >= 0)
{
my $type = shift;
my $var = shift;
if (defined($formats{$type}))
{
if ($formats{$type} =~ /^&(.*)/)
{
my $func = $1;
push @trace_lines, " fprintf( stderr, \" $var=\" );\n";
push @trace_lines, " $func( &req->$var );\n";
push @trace_lines, " fprintf( stderr, \",\" );\n" if ($#_ > 0);
}
else
{
push @trace_lines, " fprintf( stderr, \" $var=$formats{$type}";
push @trace_lines, "," if ($#_ > 0);
push @trace_lines, "\", ";
# In the case of time_t we need to cast the parameter to
# long to match the associated "%ld" printf modifier.
push @trace_lines, "(long)" if( $type eq "time_t" );
push @trace_lines, "req->$var );\n";
}
}
else # must be some varargs format
{
my $func = $type;
push @trace_lines, " fprintf( stderr, \" $var=\" );\n";
push @trace_lines, " $func;\n";
push @trace_lines, " fputc( ',', stderr );\n" if ($#_ > 0);
}
}
push @trace_lines, "}\n\n";
}
### Retrieve the server protocol version from the existing server_protocol.h file ### Retrieve the server protocol version from the existing server_protocol.h file
sub GET_PROTOCOL_VERSION() sub GET_PROTOCOL_VERSION()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment