Change 24733 allows several pointers to be NULL. Therefore this

should be reflected in their attributes.

p4raw-id: //depot/perl@24736

diff --git a/embed.fnc b/embed.fnc
index 38b2ab5..05ea88a 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -712,11 +712,11 @@ Amb       |IV     |sv_2iv         |NN SV* sv
 Apd    |IV     |sv_2iv_flags   |NN SV* sv|I32 flags
 Apd    |SV*    |sv_2mortal     |NN SV* sv
 Apd    |NV     |sv_2nv         |NN SV* sv
-Amb    |char*  |sv_2pv         |NN SV* sv|NN STRLEN* lp
-Apd    |char*  |sv_2pv_flags   |NN SV* sv|NN STRLEN* lp|I32 flags
-Apd    |char*  |sv_2pvutf8     |NN SV* sv|NN STRLEN* lp
-Apd    |char*  |sv_2pvbyte     |NN SV* sv|NN STRLEN* lp
-Ap     |char*  |sv_pvn_nomg    |NN SV* sv|NN STRLEN* lp
+Amb    |char*  |sv_2pv         |NN SV* sv|STRLEN* lp
+Apd    |char*  |sv_2pv_flags   |NN SV* sv|STRLEN* lp|I32 flags
+Apd    |char*  |sv_2pvutf8     |NN SV* sv|STRLEN* lp
+Apd    |char*  |sv_2pvbyte     |NN SV* sv|STRLEN* lp
+Ap     |char*  |sv_pvn_nomg    |NN SV* sv|STRLEN* lp
 Amb    |UV     |sv_2uv         |NN SV* sv
 Apd    |UV     |sv_2uv_flags   |NN SV* sv|I32 flags
 Apd    |IV     |sv_iv          |NN SV* sv

diff --git a/proto.h b/proto.h
index d0ed02b..9f5ced8 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1346,24 +1346,19 @@ PERL_CALLCONV NV        Perl_sv_2nv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1);
 
 /* PERL_CALLCONV char* sv_2pv(pTHX_ SV* sv, STRLEN* lp)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2); */
+                       __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV char*    Perl_sv_2pv_flags(pTHX_ SV* sv, STRLEN* lp, I32 flags)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
+                       __attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV char*    Perl_sv_2pvutf8(pTHX_ SV* sv, STRLEN* lp)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
+                       __attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV char*    Perl_sv_2pvbyte(pTHX_ SV* sv, STRLEN* lp)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
+                       __attribute__nonnull__(pTHX_1);
 
 PERL_CALLCONV char*    Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
+                       __attribute__nonnull__(pTHX_1);
 
 /* PERL_CALLCONV UV    sv_2uv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1); */