This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Capitalise magic descriptions consistently
[perl5.git]
/
doio.c
diff --git
a/doio.c
b/doio.c
index
762903e
..
c7aceca
100644
(file)
--- a/
doio.c
+++ b/
doio.c
@@
-64,7
+64,6
@@
static IO *
S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
int *savefd, char *savetype)
{
S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp,
int *savefd, char *savetype)
{
- dVAR;
IO * const io = GvIOn(gv);
PERL_ARGS_ASSERT_OPENN_SETUP;
IO * const io = GvIOn(gv);
PERL_ARGS_ASSERT_OPENN_SETUP;
@@
-145,7
+144,6
@@
bool
Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len,
int rawmode, int rawperm)
{
Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len,
int rawmode, int rawperm)
{
- dVAR;
PerlIO *saveifp;
PerlIO *saveofp;
int savefd;
PerlIO *saveifp;
PerlIO *saveofp;
int savefd;
@@
-215,7
+213,6
@@
bool
Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
PerlIO *supplied_fp, SV **svp, U32 num_svs)
{
Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
PerlIO *supplied_fp, SV **svp, U32 num_svs)
{
- dVAR;
PerlIO *saveifp;
PerlIO *saveofp;
int savefd;
PerlIO *saveifp;
PerlIO *saveofp;
int savefd;
@@
-394,7
+391,7
@@
Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len,
num_svs = 0;
}
else if (isDIGIT(*type)) {
num_svs = 0;
}
else if (isDIGIT(*type)) {
- wanted_fd =
atoi(type
);
+ wanted_fd =
grok_atou(type, NULL
);
}
else {
const IO* thatio;
}
else {
const IO* thatio;
@@
-802,9
+799,8
@@
say_false:
}
PerlIO *
}
PerlIO *
-Perl_nextargv(pTHX_ GV *gv)
+Perl_nextargv(pTHX_ GV *gv
, bool nomagicopen
)
{
{
- dVAR;
IO * const io = GvIOp(gv);
PERL_ARGS_ASSERT_NEXTARGV;
IO * const io = GvIOp(gv);
PERL_ARGS_ASSERT_NEXTARGV;
@@
-841,7
+837,10
@@
Perl_nextargv(pTHX_ GV *gv)
SvSETMAGIC(GvSV(gv));
PL_oldname = SvPVx(GvSV(gv), oldlen);
if (LIKELY(!PL_inplace)) {
SvSETMAGIC(GvSV(gv));
PL_oldname = SvPVx(GvSV(gv), oldlen);
if (LIKELY(!PL_inplace)) {
- if (do_open6(gv, PL_oldname, oldlen, NULL, NULL, 0)) {
+ if (nomagicopen
+ ? do_open6(gv, "<", 1, NULL, &GvSV(gv), 1)
+ : do_open6(gv, PL_oldname, oldlen, NULL, NULL, 0)
+ ) {
return IoIFP(GvIOp(gv));
}
}
return IoIFP(GvIOp(gv));
}
}
@@
-1027,7
+1026,6
@@
Perl_nextargv(pTHX_ GV *gv)
bool
Perl_do_close(pTHX_ GV *gv, bool not_implicit)
{
bool
Perl_do_close(pTHX_ GV *gv, bool not_implicit)
{
- dVAR;
bool retval;
IO *io;
bool retval;
IO *io;
@@
-1059,7
+1057,6
@@
Perl_do_close(pTHX_ GV *gv, bool not_implicit)
bool
Perl_io_close(pTHX_ IO *io, bool not_implicit)
{
bool
Perl_io_close(pTHX_ IO *io, bool not_implicit)
{
- dVAR;
bool retval = FALSE;
PERL_ARGS_ASSERT_IO_CLOSE;
bool retval = FALSE;
PERL_ARGS_ASSERT_IO_CLOSE;
@@
-1100,7
+1097,6
@@
Perl_io_close(pTHX_ IO *io, bool not_implicit)
bool
Perl_do_eof(pTHX_ GV *gv)
{
bool
Perl_do_eof(pTHX_ GV *gv)
{
- dVAR;
IO * const io = GvIO(gv);
PERL_ARGS_ASSERT_DO_EOF;
IO * const io = GvIO(gv);
PERL_ARGS_ASSERT_DO_EOF;
@@
-1133,7
+1129,7
@@
Perl_do_eof(pTHX_ GV *gv)
PerlIO_set_cnt(IoIFP(io),-1);
}
if (PL_op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */
PerlIO_set_cnt(IoIFP(io),-1);
}
if (PL_op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */
- if (gv != PL_argvgv || !nextargv(gv
))
/* get another fp handy */
+ if (gv != PL_argvgv || !nextargv(gv
, FALSE))
/* get another fp handy */
return TRUE;
}
else
return TRUE;
}
else
@@
-1145,7
+1141,6
@@
Perl_do_eof(pTHX_ GV *gv)
Off_t
Perl_do_tell(pTHX_ GV *gv)
{
Off_t
Perl_do_tell(pTHX_ GV *gv)
{
- dVAR;
IO *const io = GvIO(gv);
PerlIO *fp;
IO *const io = GvIO(gv);
PerlIO *fp;
@@
-1162,7
+1157,6
@@
Perl_do_tell(pTHX_ GV *gv)
bool
Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
{
bool
Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
{
- dVAR;
IO *const io = GvIO(gv);
PerlIO *fp;
IO *const io = GvIO(gv);
PerlIO *fp;
@@
-1177,7
+1171,6
@@
Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
Off_t
Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence)
{
Off_t
Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence)
{
- dVAR;
IO *const io = GvIO(gv);
PerlIO *fp;
IO *const io = GvIO(gv);
PerlIO *fp;
@@
-1198,6
+1191,7
@@
int
Perl_mode_from_discipline(pTHX_ const char *s, STRLEN len)
{
int mode = O_BINARY;
Perl_mode_from_discipline(pTHX_ const char *s, STRLEN len)
{
int mode = O_BINARY;
+ PERL_UNUSED_CONTEXT;
if (s) {
while (*s) {
if (*s == ':') {
if (s) {
while (*s) {
if (*s == ':') {
@@
-1304,8
+1298,6
@@
my_chsize(int fd, Off_t length)
bool
Perl_do_print(pTHX_ SV *sv, PerlIO *fp)
{
bool
Perl_do_print(pTHX_ SV *sv, PerlIO *fp)
{
- dVAR;
-
PERL_ARGS_ASSERT_DO_PRINT;
/* assuming fp is checked earlier */
PERL_ARGS_ASSERT_DO_PRINT;
/* assuming fp is checked earlier */
@@
-1377,7
+1369,6
@@
Perl_do_print(pTHX_ SV *sv, PerlIO *fp)
I32
Perl_my_stat_flags(pTHX_ const U32 flags)
{
I32
Perl_my_stat_flags(pTHX_ const U32 flags)
{
- dVAR;
dSP;
IO *io;
GV* gv;
dSP;
IO *io;
GV* gv;
@@
-1444,7
+1435,6
@@
Perl_my_stat_flags(pTHX_ const U32 flags)
I32
Perl_my_lstat_flags(pTHX_ const U32 flags)
{
I32
Perl_my_lstat_flags(pTHX_ const U32 flags)
{
- dVAR;
static const char* const no_prev_lstat = "The stat preceding -l _ wasn't an lstat";
dSP;
const char *file;
static const char* const no_prev_lstat = "The stat preceding -l _ wasn't an lstat";
dSP;
const char *file;
@@
-1560,7
+1550,6
@@
Perl_do_aexec5(pTHX_ SV *really, SV **mark, SV **sp,
void
Perl_do_execfree(pTHX)
{
void
Perl_do_execfree(pTHX)
{
- dVAR;
Safefree(PL_Argv);
PL_Argv = NULL;
Safefree(PL_Cmd);
Safefree(PL_Argv);
PL_Argv = NULL;
Safefree(PL_Cmd);
@@
-1709,7
+1698,6
@@
Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
I32
Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
{
I32
Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
{
- dVAR;
I32 val;
I32 tot = 0;
const char *const what = PL_op_name[type];
I32 val;
I32 tot = 0;
const char *const what = PL_op_name[type];
@@
-2046,9
+2034,8
@@
Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t *statbufp)
* is in the list of groups returned from getgroups().
*/
{
* is in the list of groups returned from getgroups().
*/
{
- dVAR;
-
PERL_ARGS_ASSERT_CANDO;
PERL_ARGS_ASSERT_CANDO;
+ PERL_UNUSED_CONTEXT;
#ifdef DOSISH
/* [Comments and code from Len Reed]
#ifdef DOSISH
/* [Comments and code from Len Reed]
@@
-2106,7
+2093,10
@@
Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t *statbufp)
static bool
S_ingroup(pTHX_ Gid_t testgid, bool effective)
{
static bool
S_ingroup(pTHX_ Gid_t testgid, bool effective)
{
- dVAR;
+#ifndef PERL_IMPLICIT_SYS
+ /* PERL_IMPLICIT_SYS like Win32: getegid() etc. require the context. */
+ PERL_UNUSED_CONTEXT;
+#endif
if (testgid == (effective ? PerlProc_getegid() : PerlProc_getgid()))
return TRUE;
#ifdef HAS_GETGROUPS
if (testgid == (effective ? PerlProc_getegid() : PerlProc_getgid()))
return TRUE;
#ifdef HAS_GETGROUPS
@@
-2139,7
+2129,6
@@
S_ingroup(pTHX_ Gid_t testgid, bool effective)
I32
Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp)
{
I32
Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp)
{
- dVAR;
const key_t key = (key_t)SvNVx(*++mark);
SV *nsv = optype == OP_MSGGET ? NULL : *++mark;
const I32 flags = SvIVx(*++mark);
const key_t key = (key_t)SvNVx(*++mark);
SV *nsv = optype == OP_MSGGET ? NULL : *++mark;
const I32 flags = SvIVx(*++mark);
@@
-2174,7
+2163,6
@@
Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp)
I32
Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
{
I32
Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
{
- dVAR;
char *a;
I32 ret = -1;
const I32 id = SvIVx(*++mark);
char *a;
I32 ret = -1;
const I32 id = SvIVx(*++mark);
@@
-2308,7
+2296,6
@@
Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp)
I32
Perl_do_msgsnd(pTHX_ SV **mark, SV **sp)
{
I32
Perl_do_msgsnd(pTHX_ SV **mark, SV **sp)
{
- dVAR;
#ifdef HAS_MSG
STRLEN len;
const I32 id = SvIVx(*++mark);
#ifdef HAS_MSG
STRLEN len;
const I32 id = SvIVx(*++mark);
@@
-2337,7
+2324,6
@@
I32
Perl_do_msgrcv(pTHX_ SV **mark, SV **sp)
{
#ifdef HAS_MSG
Perl_do_msgrcv(pTHX_ SV **mark, SV **sp)
{
#ifdef HAS_MSG
- dVAR;
char *mbuf;
long mtype;
I32 msize, flags, ret;
char *mbuf;
long mtype;
I32 msize, flags, ret;
@@
-2378,7
+2364,6
@@
I32
Perl_do_semop(pTHX_ SV **mark, SV **sp)
{
#ifdef HAS_SEM
Perl_do_semop(pTHX_ SV **mark, SV **sp)
{
#ifdef HAS_SEM
- dVAR;
STRLEN opsize;
const I32 id = SvIVx(*++mark);
SV * const opstr = *++mark;
STRLEN opsize;
const I32 id = SvIVx(*++mark);
SV * const opstr = *++mark;
@@
-2424,7
+2409,6
@@
I32
Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
{
#ifdef HAS_SHM
Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
{
#ifdef HAS_SHM
- dVAR;
char *shm;
struct shmid_ds shmds;
const I32 id = SvIVx(*++mark);
char *shm;
struct shmid_ds shmds;
const I32 id = SvIVx(*++mark);
@@
-2498,7
+2482,6
@@
Moving it away shrinks pp_hot.c; shrinking pp_hot.c helps speed perl up.
PerlIO *
Perl_start_glob (pTHX_ SV *tmpglob, IO *io)
{
PerlIO *
Perl_start_glob (pTHX_ SV *tmpglob, IO *io)
{
- dVAR;
SV * const tmpcmd = newSV(0);
PerlIO *fp;
STRLEN len;
SV * const tmpcmd = newSV(0);
PerlIO *fp;
STRLEN len;