summaryrefslogtreecommitdiff
path: root/perl.h
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2003-07-04 08:33:32 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2003-07-04 08:33:32 +0000
commitb089116590f5bd8ca52e6ccd2a029c8fc0abb2ae (patch)
treec5cf380d0ab303e0cb6686a1027ab9005ff019d6 /perl.h
parent228cf569ab8135ec43daadaff1c31143a0539e1e (diff)
downloadperl-b089116590f5bd8ca52e6ccd2a029c8fc0abb2ae.tar.gz
Remove PL_earlytaint since the hash seed code
can be delayed until perl_parse(). p4raw-id: //depot/perl@19979
Diffstat (limited to 'perl.h')
-rw-r--r--perl.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/perl.h b/perl.h
index 8e3516857f..a361e0f234 100644
--- a/perl.h
+++ b/perl.h
@@ -499,7 +499,7 @@ int usleep(unsigned int);
panic_write2("panic: tainting with $ENV{PERL_MALLOC_OPT}\n");\
exit(1); })
# define MALLOC_CHECK_TAINT(argc,argv,env) STMT_START { \
- if (PL_earlytaint) { \
+ if (doing_taint(argc,argv,env)) { \
MallocCfg_ptr[MallocCfg_skip_cfg_env] = 1; \
}} STMT_END;
#else /* MYMALLOC */
@@ -1942,23 +1942,6 @@ typedef struct clone_params CLONE_PARAMS;
# endif
#endif
-/* The PL_earlytaint is to be used instead PL_tainting before
- * perl_parse() has had the chance to set up PL_tainting. */
-
-#ifndef EARLY_INIT3
-# define EARLY_INIT3(argcp,argvp,envp) \
- STMT_START { \
- PL_earlytaint = doing_taint(argcp, argvp, envp); \
- } STMT_END;
-#endif
-
-#ifndef EARLY_INIT2
-# define EARLY_INIT2(argcp,argvp) \
- STMT_START { \
- PL_earlytaint = doing_taint(argcp, argvp, 0); \
- } STMT_END;
-#endif
-
#ifndef PERL_SYS_INIT3
# define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp)
#endif