In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/290611cefbeeb19c7f6305f985c6b4efccf434aa?hp=535e48ea19f4d8f568f8581284e630b9a1f38c43>
- Log -----------------------------------------------------------------
commit 290611cefbeeb19c7f6305f985c6b4efccf434aa
Author: Father Chrysostomos <spr...@cpan.org>
Date: Sun Jan 12 07:55:30 2014 -0800
Use NOT_REACHED in one more place in op.c
Under clang, this reduces the size of op.o by 16 bytes.
$ clang -v
Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
Target: x86_64-apple-darwin12.5.0
Thread model: posix
M op.c
commit 8de90695ebca09be55363851efd41433f9eaac50
Author: Father Chrysostomos <spr...@cpan.org>
Date: Fri Jan 10 05:53:19 2014 -0800
pp_ctl.c:pp_require: Remove redundant VMS null checks
SvPVX(newSVpv("",...)) should never return null.
M pp_ctl.c
-----------------------------------------------------------------------
Summary of changes:
op.c | 2 +-
pp_ctl.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/op.c b/op.c
index fc5742f..6cf532f 100644
--- a/op.c
+++ b/op.c
@@ -10620,7 +10620,7 @@ Perl_ck_entersub_args_core(pTHX_ OP *entersubop, GV
*namegv, SV *protosv)
)
);
}
- assert(0);
+ NOT_REACHED;
}
else {
OP *prev, *cvop;
diff --git a/pp_ctl.c b/pp_ctl.c
index fcfa3a1..2b7b3a9 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3671,9 +3671,7 @@ PP(pp_require)
STRLEN unixlen;
#ifdef VMS
int vms_unixname = 0;
- char *unixnamebuf;
char *unixdir;
- char *unixdirbuf;
#endif
const char *tryname = NULL;
SV *namesv = NULL;
@@ -3768,8 +3766,9 @@ PP(pp_require)
* name can be translated to UNIX.
*/
- if ((unixnamebuf = SvPVX(sv_2mortal(newSVpv("", VMS_MAXRSS-1))))
- && (unixname = tounixspec(name, unixnamebuf)) != NULL) {
+ if ((unixname =
+ tounixspec(name, SvPVX(sv_2mortal(newSVpv("", VMS_MAXRSS-1)))))
+ != NULL) {
unixlen = strlen(unixname);
vms_unixname = 1;
}
@@ -3960,8 +3959,9 @@ PP(pp_require)
if (!IS_SAFE_SYSCALL(dir, dirlen, "@INC entry", "require"))
continue;
#ifdef VMS
- if (((unixdirbuf = SvPVX(sv_2mortal(newSVpv("",
VMS_MAXRSS-1)))) == NULL)
- || ((unixdir = tounixpath(dir, unixdirbuf)) == NULL))
+ if ((unixdir =
+ tounixpath(dir, SvPVX(sv_2mortal(newSVpv("",
VMS_MAXRSS-1)))))
+ == NULL)
continue;
sv_setpv(namesv, unixdir);
sv_catpv(namesv, unixname);
--
Perl5 Master Repository
