From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 18 Jun 2001 23:45:12 +0000 (+0000)
Subject: gcc -Wall sweep.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c46a0ec2e4dd739764813c48d759541d301ed265;p=p5sagit%2Fp5-mst-13.2.git

gcc -Wall sweep.

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

diff --git a/ext/IO/IO.xs b/ext/IO/IO.xs
index ef91a97..6741905 100644
--- a/ext/IO/IO.xs
+++ b/ext/IO/IO.xs
@@ -361,33 +361,47 @@ fflush(handle)
 	RETVAL
 
 void
-setbuf(handle, buf)
+setbuf(handle, ...)
 	OutputStream	handle
-	char *		buf = SvPOK(ST(1)) ? sv_grow(ST(1), BUFSIZ) : 0;
     CODE:
 	if (handle)
 #ifdef PERLIO_IS_STDIO
+        {
+	    char *buf = items == 2 && SvPOK(ST(1)) ?
+	      sv_grow(ST(1), BUFSIZ) : 0;
 	    setbuf(handle, buf);
+	}
 #else
 	    not_here("IO::Handle::setbuf");
 #endif
 
 SysRet
-setvbuf(handle, buf, type, size)
-	OutputStream	handle
-	char *		buf = SvPOK(ST(1)) ? sv_grow(ST(1), SvIV(ST(3))) : 0;
-	int		type
-	int		size
+setvbuf(...)
     CODE:
+	if (items != 4)
+            Perl_croak(aTHX_ "Usage: IO::Handle::setvbuf(handle, buf, type, size)");
 #if defined(PERLIO_IS_STDIO) && defined(_IOFBF) && defined(HAS_SETVBUF)
+    {
+        OutputStream	handle = 0;
+	char *		buf = SvPOK(ST(1)) ? sv_grow(ST(1), SvIV(ST(3))) : 0;
+	int		type;
+	int		size;
+
+	if (items == 4) {
+	    handle = IoOFP(sv_2io(ST(0)));
+	    buf    = SvPOK(ST(1)) ? sv_grow(ST(1), SvIV(ST(3))) : 0;
+	    type   = (int)SvIV(ST(2));
+	    size   = (int)SvIV(ST(3));
+	}
 	if (!handle)			/* Try input stream. */
 	    handle = IoIFP(sv_2io(ST(0)));
-	if (handle)
+	if (items == 4 && handle)
 	    RETVAL = setvbuf(handle, buf, type, size);
 	else {
 	    RETVAL = -1;
 	    errno = EINVAL;
 	}
+    }
 #else
 	RETVAL = (SysRet) not_here("IO::Handle::setvbuf");
 #endif
diff --git a/ext/Time/Piece/Piece.xs b/ext/Time/Piece/Piece.xs
index bae2d4c..d888588 100644
--- a/ext/Time/Piece/Piece.xs
+++ b/ext/Time/Piece/Piece.xs
@@ -32,9 +32,7 @@ __strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -
     CODE:
     #XXX: an sv_strftime() that can make use of the TARG would faster
     buf = my_strftime(fmt, sec, min, hour, mday, mon, year, wday, yday, isdst);
-    if (buf) {
-        RETVAL = buf;
-    }
+    RETVAL = buf;
 
     OUTPUT:
     RETVAL