From: Gurusamy Sarathy <gsar@cpan.org>
Date: Thu, 4 May 2000 17:26:14 +0000 (+0000)
Subject: change#5905 wasn't quite right--it's intent only applies when arguments
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=be28567c7b4a66645fbbd71964c8c6819169207c;p=p5sagit%2Fp5-mst-13.2.git

change#5905 wasn't quite right--it's intent only applies when arguments
to sv_vcatpvfn() are SVs instead of C types; back out change#5907 as well

p4raw-link: @5907 on //depot/cfgperl: 7cfcdf208eb7eff0b6f8313f1a5b14880681119d
p4raw-link: @5905 on //depot/cfgperl: 686fa4bb8e88f0c9a36218cdbf3c49f4a7b93b2a

p4raw-id: //depot/perl@6064
---

diff --git a/pp_sys.c b/pp_sys.c
index ca7fbed..461f6f7 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -4085,14 +4085,14 @@ PP(pp_gmtime)
 	SV *tsv;
 	if (!tmbuf)
 	    RETPUSHUNDEF;
-	tsv = Perl_newSVpvf(aTHX_ "%s %s %2"IVdf" %02"IVdf":%02"IVdf":%02"IVdf" %"IVdf,
+	tsv = Perl_newSVpvf(aTHX_ "%s %s %2d %02d:%02d:%02d %d",
 			    dayname[tmbuf->tm_wday],
 			    monname[tmbuf->tm_mon],
-			    (IV)tmbuf->tm_mday,
-			    (IV)tmbuf->tm_hour,
-			    (IV)tmbuf->tm_min,
-			    (IV)tmbuf->tm_sec,
-			    (IV)tmbuf->tm_year + 1900);
+			    tmbuf->tm_mday,
+			    tmbuf->tm_hour,
+			    tmbuf->tm_min,
+			    tmbuf->tm_sec,
+			    tmbuf->tm_year + 1900);
 	PUSHs(sv_2mortal(tsv));
     }
     else if (tmbuf) {
diff --git a/sv.c b/sv.c
index e76e40f..9780450 100644
--- a/sv.c
+++ b/sv.c
@@ -5935,11 +5935,6 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	    break;
 	}
 
-#ifdef USE_64_BIT_INT
-	if (!intsize)
-	    intsize = 'q';
-#endif
-
 	/* CONVERSION */
 
 	switch (c = *q++) {
@@ -6069,7 +6064,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 		iv = (svix < svmax) ? SvIVx(svargs[svix++]) : 0;
 		switch (intsize) {
 		case 'h':	iv = (short)iv; break;
-		default:	iv = (int)iv; break;
+		default:	break;
 		case 'l':	iv = (long)iv; break;
 		case 'V':	break;
 #ifdef HAS_QUAD
@@ -6151,7 +6146,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 		uv = (svix < svmax) ? SvUVx(svargs[svix++]) : 0;
 		switch (intsize) {
 		case 'h':	uv = (unsigned short)uv; break;
-		default:	uv = (unsigned)uv; break;
+		default:	break;
 		case 'l':	uv = (unsigned long)uv; break;
 		case 'V':	break;
 #ifdef HAS_QUAD