@@ -242,6 +242,7 @@ sub generate_proto_h {
242242 my $n ;
243243 for my $arg ( @$args ) {
244244 ++$n ;
245+
245246 if ($arg =~ / ^ " (.+) " $ /x ) { # Handle literal string
246247 my $name = $1 ;
247248
@@ -255,51 +256,51 @@ sub generate_proto_h {
255256 unless $has_mflag ;
256257 }
257258 else {
258- if ( $args_assert_line
259- && $arg =~ / \* /
260- && $arg !~ / \b (NN|NULLOK)\b / )
261- {
262- warn " $func : $arg needs NN or NULLOK\n " ;
263- ++$unflagged_pointers ;
264- }
259+ if ( $args_assert_line
260+ && $arg =~ / \* /
261+ && $arg !~ / \b (NN|NULLOK)\b / )
262+ {
263+ warn " $func : $arg needs NN or NULLOK\n " ;
264+ ++$unflagged_pointers ;
265+ }
265266
266- my $nn = ( $arg =~ s /\s *\b NN\b\s +// );
267- my $nz = ( $arg =~ s /\s *\b NZ\b\s +// );
268- my $nullok = ( $arg =~ s /\s *\b NULLOK\b\s +// );
269- my $nocheck = ( $arg =~ s /\s *\b NOCHECK\b\s +// );
267+ my $nn = ( $arg =~ s /\s *\b NN\b\s +// );
268+ my $nz = ( $arg =~ s /\s *\b NZ\b\s +// );
269+ my $nullok = ( $arg =~ s /\s *\b NULLOK\b\s +// );
270+ my $nocheck = ( $arg =~ s /\s *\b NOCHECK\b\s +// );
270271
271- push ( @nonnull , $n ) if $nn ;
272+ push ( @nonnull , $n ) if $nn ;
272273
273- # Make sure each arg has at least a type and a var name.
274- # An arg of "int" is valid C, but want it to be "int foo".
275- my $argtype = ( $arg =~ m / ^(\w +(?:\s *\* +)?)/ )[0];
276- defined $argtype and $argtype =~ s /\s +// g ;
274+ # Make sure each arg has at least a type and a var name.
275+ # An arg of "int" is valid C, but want it to be "int foo".
276+ my $argtype = ( $arg =~ m / ^(\w +(?:\s *\* +)?)/ )[0];
277+ defined $argtype and $argtype =~ s /\s +// g ;
277278
278- my $temp_arg = $arg ;
279- $temp_arg =~ s /\* // g ;
280- $temp_arg =~ s /\s *\b struct\b\s */ / g ;
281- if ( ($temp_arg ne " ..." )
282- && ($temp_arg !~ / \w +\s +(\w +)(?:\[\d +\] )?\s *$ / ) ) {
283- die_at_end " $func : $arg ($n ) doesn't have a name\n " ;
284- }
285- my $argname = $1 ;
286-
287- if (defined $argname && (! $has_mflag || $binarycompat )) {
288- if ($nn ||$nz ) {
289- push @asserts , " assert($argname )" ;
279+ my $temp_arg = $arg ;
280+ $temp_arg =~ s /\* // g ;
281+ $temp_arg =~ s /\s *\b struct\b\s */ / g ;
282+ if ( ($temp_arg ne " ..." )
283+ && ($temp_arg !~ / \w +\s +(\w +)(?:\[\d +\] )?\s *$ / ) ) {
284+ die_at_end " $func : $arg ($n ) doesn't have a name\n " ;
290285 }
291-
292- if ( ! $nocheck
293- && defined $argtype
294- && exists $type_asserts {$argtype })
295- {
296- my $type_assert =
297- $type_asserts {$argtype } =~ s / __arg__/ $argname / gr ;
298- $type_assert = " !$argname || $type_assert " if $nullok ;
299- push @asserts , " assert($type_assert )" ;
286+ my $argname = $1 ;
287+
288+ if (defined $argname && (! $has_mflag || $binarycompat )) {
289+ if ($nn ||$nz ) {
290+ push @asserts , " assert($argname )" ;
291+ }
292+
293+ if ( ! $nocheck
294+ && defined $argtype
295+ && exists $type_asserts {$argtype })
296+ {
297+ my $type_assert =
298+ $type_asserts {$argtype } =~ s / __arg__/ $argname / gr ;
299+ $type_assert = " !$argname || $type_assert " if $nullok ;
300+ push @asserts , " assert($type_assert )" ;
301+ }
300302 }
301303 }
302- }
303304 }
304305 $ret .= join " , " , @$args ;
305306 }
0 commit comments