Skip to content

Commit a04ef3f

Browse files
Remove obsolete FCRYPT ifdefs and associated PL_cryptseen (Perl#17624)
Co-authored-by: Karl Williamson <[email protected]>
1 parent 9a2d423 commit a04ef3f

File tree

7 files changed

+5
-19
lines changed

7 files changed

+5
-19
lines changed

embedvar.h

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
#define PL_comppad_name_floor (vTHX->Icomppad_name_floor)
108108
#define PL_constpadix (vTHX->Iconstpadix)
109109
#define PL_cop_seqmax (vTHX->Icop_seqmax)
110-
#define PL_cryptseen (vTHX->Icryptseen)
111110
#define PL_curcop (vTHX->Icurcop)
112111
#define PL_curcopdb (vTHX->Icurcopdb)
113112
#define PL_curlocales (vTHX->Icurlocales)

intrpvar.h

+3
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,9 @@ PERLVARI(I, underlying_numeric_obj, locale_t, NULL)
743743
# endif
744744
#endif /* !USE_LOCALE_NUMERIC */
745745

746+
PERLVAR(I, pad_reset_pending, bool) /* reset pad on next attempted alloc */
747+
PERLVAR(I, srand_called, bool)
748+
746749
/* Array of signal handlers, indexed by signal number, through which the C
747750
signal handler dispatches. */
748751
PERLVAR(I, psig_ptr, SV **)

makedef.pl

-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ sub readvar {
219219

220220
if ($ARGS{PLATFORM} ne 'os2') {
221221
++$skip{$_} foreach qw(
222-
PL_cryptseen
223222
PL_opsave
224223
Perl_dump_fds
225224
Perl_my_bcopy

perl.h

-3
Original file line numberDiff line numberDiff line change
@@ -4956,9 +4956,6 @@ EXTCONST char PL_bincompat_options[] =
49564956
# ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP
49574957
" DEBUG_LEAKING_SCALARS_FORK_DUMP"
49584958
# endif
4959-
# ifdef FCRYPT
4960-
" FCRYPT"
4961-
# endif
49624959
# ifdef HAS_TIMES
49634960
" HAS_TIMES"
49644961
# endif

pp.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -3684,11 +3684,8 @@ PP(pp_crypt)
36843684
# endif /* HAS_CRYPT_R */
36853685
# endif /* USE_ITHREADS */
36863686

3687-
# ifdef FCRYPT
3688-
sv_setpv(TARG, fcrypt(tmps, SvPV_nolen_const(right)));
3689-
# else
36903687
sv_setpv(TARG, PerlProc_crypt(tmps, SvPV_nolen_const(right)));
3691-
# endif
3688+
36923689
SvUTF8_off(TARG);
36933690
SETTARG;
36943691
RETURN;

sv.c

-4
Original file line numberDiff line numberDiff line change
@@ -15334,10 +15334,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
1533415334

1533515335
PL_cv_has_eval = proto_perl->Icv_has_eval;
1533615336

15337-
#ifdef FCRYPT
15338-
PL_cryptseen = proto_perl->Icryptseen;
15339-
#endif
15340-
1534115337
#ifdef USE_LOCALE_COLLATE
1534215338
PL_collation_ix = proto_perl->Icollation_ix;
1534315339
PL_collation_standard = proto_perl->Icollation_standard;

toke.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -7675,12 +7675,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct
76757675
UNI(OP_CALLER);
76767676

76777677
case KEY_crypt:
7678-
#ifdef FCRYPT
7679-
if (!PL_cryptseen) {
7680-
PL_cryptseen = TRUE;
7681-
init_des();
7682-
}
7683-
#endif
7678+
76847679
LOP(OP_CRYPT,XTERM);
76857680

76867681
case KEY_chmod:

0 commit comments

Comments
 (0)