@@ -233,6 +233,7 @@ sub generate_proto_h {
233
233
my $n ;
234
234
for my $arg ( @$args ) {
235
235
++$n ;
236
+
236
237
if ($arg =~ / ^ " (.+) " $ /x ) { # Handle literal string
237
238
my $name = $1 ;
238
239
@@ -246,51 +247,51 @@ sub generate_proto_h {
246
247
unless $has_mflag ;
247
248
}
248
249
else {
249
- if ( $args_assert_line
250
- && $arg =~ / \* /
251
- && $arg !~ / \b (NN|NULLOK)\b / )
252
- {
253
- warn " $func : $arg needs NN or NULLOK\n " ;
254
- ++$unflagged_pointers ;
255
- }
250
+ if ( $args_assert_line
251
+ && $arg =~ / \* /
252
+ && $arg !~ / \b (NN|NULLOK)\b / )
253
+ {
254
+ warn " $func : $arg needs NN or NULLOK\n " ;
255
+ ++$unflagged_pointers ;
256
+ }
256
257
257
- my $nn = ( $arg =~ s /\s *\b NN\b\s +// );
258
- my $nz = ( $arg =~ s /\s *\b NZ\b\s +// );
259
- my $nullok = ( $arg =~ s /\s *\b NULLOK\b\s +// );
260
- my $nocheck = ( $arg =~ s /\s *\b NOCHECK\b\s +// );
258
+ my $nn = ( $arg =~ s /\s *\b NN\b\s +// );
259
+ my $nz = ( $arg =~ s /\s *\b NZ\b\s +// );
260
+ my $nullok = ( $arg =~ s /\s *\b NULLOK\b\s +// );
261
+ my $nocheck = ( $arg =~ s /\s *\b NOCHECK\b\s +// );
261
262
262
- push ( @nonnull , $n ) if $nn ;
263
+ push ( @nonnull , $n ) if $nn ;
263
264
264
- # Make sure each arg has at least a type and a var name.
265
- # An arg of "int" is valid C, but want it to be "int foo".
266
- my $argtype = ( $arg =~ m / ^(\w +(?:\s *\* +)?)/ )[0];
267
- defined $argtype and $argtype =~ s /\s +// g ;
265
+ # Make sure each arg has at least a type and a var name.
266
+ # An arg of "int" is valid C, but want it to be "int foo".
267
+ my $argtype = ( $arg =~ m / ^(\w +(?:\s *\* +)?)/ )[0];
268
+ defined $argtype and $argtype =~ s /\s +// g ;
268
269
269
- my $temp_arg = $arg ;
270
- $temp_arg =~ s /\* // g ;
271
- $temp_arg =~ s /\s *\b struct\b\s */ / g ;
272
- if ( ($temp_arg ne " ..." )
273
- && ($temp_arg !~ / \w +\s +(\w +)(?:\[\d +\] )?\s *$ / ) ) {
274
- die_at_end " $func : $arg ($n ) doesn't have a name\n " ;
275
- }
276
- my $argname = $1 ;
277
-
278
- if (defined $argname && (! $has_mflag || $binarycompat )) {
279
- if ($nn ||$nz ) {
280
- push @asserts , " assert($argname )" ;
270
+ my $temp_arg = $arg ;
271
+ $temp_arg =~ s /\* // g ;
272
+ $temp_arg =~ s /\s *\b struct\b\s */ / g ;
273
+ if ( ($temp_arg ne " ..." )
274
+ && ($temp_arg !~ / \w +\s +(\w +)(?:\[\d +\] )?\s *$ / ) ) {
275
+ die_at_end " $func : $arg ($n ) doesn't have a name\n " ;
281
276
}
282
-
283
- if ( ! $nocheck
284
- && defined $argtype
285
- && exists $type_asserts {$argtype })
286
- {
287
- my $type_assert =
288
- $type_asserts {$argtype } =~ s / __arg__/ $argname / gr ;
289
- $type_assert = " !$argname || $type_assert " if $nullok ;
290
- push @asserts , " assert($type_assert )" ;
277
+ my $argname = $1 ;
278
+
279
+ if (defined $argname && (! $has_mflag || $binarycompat )) {
280
+ if ($nn ||$nz ) {
281
+ push @asserts , " assert($argname )" ;
282
+ }
283
+
284
+ if ( ! $nocheck
285
+ && defined $argtype
286
+ && exists $type_asserts {$argtype })
287
+ {
288
+ my $type_assert =
289
+ $type_asserts {$argtype } =~ s / __arg__/ $argname / gr ;
290
+ $type_assert = " !$argname || $type_assert " if $nullok ;
291
+ push @asserts , " assert($type_assert )" ;
292
+ }
291
293
}
292
294
}
293
- }
294
295
}
295
296
$ret .= join " , " , @$args ;
296
297
}
0 commit comments