regen/embed.pl: Improve error checking

This commit verifies that only one of the mutually exclusive argument
modifiers, like NN, is present, and that NZ isn't used for a pointer
argument.

Author: khwilliamson

regen/embed.pl

@@ -247,19 +247,30 @@ sub generate_proto_h {
                                                             unless $has_mflag;
                 }
                 else {
-                    if (   $args_assert_line
-                        && $arg =~ /\*/
-                        && $arg !~ /\b(NN|NULLOK)\b/ )
-                    {
-                        warn "$func: $arg needs NN or NULLOK\n";
-                        ++$unflagged_pointers;
-                    }
-
                     my $nn =      ( $arg =~ s/\s*\bNN\b\s+// );
                     my $nz =      ( $arg =~ s/\s*\bNZ\b\s+// );
                     my $nullok =  ( $arg =~ s/\s*\bNULLOK\b\s+// );
                     my $nocheck = ( $arg =~ s/\s*\bNOCHECK\b\s+// );
 
+                    die_at_end ":$func: $arg Use only one of NN, NULLOK, and NZ"
+                                                if 0 + $nn + $nz + $nullok > 1;
+
+                    push( @nonnull, $n ) if $nn;
+
+                    # A non-pointer shouldn't have a pointer-related modifier.
+                    # But typedefs may be pointers without our knowing it, so
+                    # we can't check for non-pointer issues.  We can only
+                    # check for the case where the argument is definitely a
+                    # pointer.
+                    if ($args_assert_line && $arg =~ /\*/) {
+                        if ($nn + $nullok == 0) {
+                            warn "$func: $arg needs NN or NULLOK\n";
+                            ++$unflagged_pointers;
+                        }
+
+                        warn "$func: $arg should not have NZ\n" if $nz;
+                    }
+
                     push( @nonnull, $n ) if $nn;
 
                     # Make sure each arg has at least a type and a var name.