Tidy up some more Pod nits.

[p5sagit/p5-mst-13.2.git] / proto.h

diff --git a/proto.h b/proto.h
index aee22c0..5fe779a 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -335,10 +335,7 @@ PERL_CALLCONV void Perl_croak_nocontext(const char* pat, ...)
                        __attribute__format__null_ok__(__printf__,1,2);
 
 PERL_CALLCONV OP*      Perl_die_nocontext(const char* pat, ...)
-                       __attribute__format__(__printf__,1,2)
-                       __attribute__nonnull__(1);
-#define PERL_ARGS_ASSERT_DIE_NOCONTEXT \
-       assert(pat)
+                       __attribute__format__null_ok__(__printf__,1,2);
 
 PERL_CALLCONV void     Perl_deb_nocontext(const char* pat, ...)
                        __attribute__format__(__printf__,1,2)
@@ -832,22 +829,10 @@ PERL_CALLCONV void        Perl_get_db_sub(pTHX_ SV **svp, CV *cv)
 
 PERL_CALLCONV void     Perl_gp_free(pTHX_ GV* gv);
 PERL_CALLCONV GP*      Perl_gp_ref(pTHX_ GP* gp);
-PERL_CALLCONV GV*      Perl_gv_add_by_type(pTHX_ GV *gv, svtype type)
-                       __attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_GV_ADD_BY_TYPE        \
-       assert(gv)
-
-/* PERL_CALLCONV GV*   Perl_gv_AVadd(pTHX_ GV *gv)
-                       __attribute__nonnull__(pTHX_1); */
-#define PERL_ARGS_ASSERT_GV_AVADD      \
-       assert(gv)
-
-/* PERL_CALLCONV GV*   Perl_gv_HVadd(pTHX_ GV *gv)
-                       __attribute__nonnull__(pTHX_1); */
-#define PERL_ARGS_ASSERT_GV_HVADD      \
-       assert(gv)
-
-PERL_CALLCONV GV*      Perl_gv_IOadd(pTHX_ GV* gv);
+PERL_CALLCONV GV*      Perl_gv_add_by_type(pTHX_ GV *gv, svtype type);
+/* PERL_CALLCONV GV*   Perl_gv_AVadd(pTHX_ GV *gv); */
+/* PERL_CALLCONV GV*   Perl_gv_HVadd(pTHX_ GV *gv); */
+/* PERL_CALLCONV GV*   Perl_gv_IOadd(pTHX_ GV* gv); */
 PERL_CALLCONV GV*      Perl_gv_autoload4(pTHX_ HV* stash, const char* name, STRLEN len, I32 method)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_2);
@@ -1519,6 +1504,12 @@ PERL_CALLCONV int        Perl_magic_clearhint(pTHX_ SV* sv, MAGIC* mg)
 #define PERL_ARGS_ASSERT_MAGIC_CLEARHINT       \
        assert(sv); assert(mg)
 
+PERL_CALLCONV int      Perl_magic_clearhints(pTHX_ SV* sv, MAGIC* mg)
+                       __attribute__nonnull__(pTHX_1)
+                       __attribute__nonnull__(pTHX_2);
+#define PERL_ARGS_ASSERT_MAGIC_CLEARHINTS      \
+       assert(sv); assert(mg)
+
 PERL_CALLCONV int      Perl_magic_clearisa(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_2);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARISA        \
@@ -2123,9 +2114,9 @@ PERL_CALLCONV HV* Perl_newHVhv(pTHX_ HV *hv)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;
 
-PERL_CALLCONV IO*      Perl_newIO(pTHX)
+/* PERL_CALLCONV IO*   Perl_newIO(pTHX)
                        __attribute__malloc__
-                       __attribute__warn_unused_result__;
+                       __attribute__warn_unused_result__; */
 
 PERL_CALLCONV OP*      Perl_newLISTOP(pTHX_ I32 type, I32 flags, OP* first, OP* last)
                        __attribute__malloc__
@@ -6347,11 +6338,7 @@ PERL_CALLCONV void       Perl_dump_sv_child(pTHX_ SV *sv)
 #endif
 
 #ifdef PERL_DONT_CREATE_GVSV
-/* PERL_CALLCONV GV*   Perl_gv_SVadd(pTHX_ GV *gv)
-                       __attribute__nonnull__(pTHX_1); */
-#define PERL_ARGS_ASSERT_GV_SVADD      \
-       assert(gv)
-
+/* PERL_CALLCONV GV*   Perl_gv_SVadd(pTHX_ GV *gv); */
 #endif
 PERL_CALLCONV bool     Perl_ckwarn(pTHX_ U32 w);
 PERL_CALLCONV bool     Perl_ckwarn_d(pTHX_ U32 w);