svn commit: r268985 - head/lib/libc/stdio

[Pedro F. Giffuni]

Author: pfg
Date: Tue Jul 22 16:39:11 2014
New Revision: 268985
URL: http://svnweb.freebsd.org/changeset/base/268985

Log:
  Mostly cosmetic cleanups.
  
  In fputs() avoid implcit casting on iov.iov_len.
  
  MFC after:	3 days

Modified:
  head/lib/libc/stdio/fputs.c
  head/lib/libc/stdio/puts.c

Modified: head/lib/libc/stdio/fputs.c
==============================================================================
--- head/lib/libc/stdio/fputs.c	Tue Jul 22 16:19:01 2014	(r268984)
+++ head/lib/libc/stdio/fputs.c	Tue Jul 22 16:39:11 2014	(r268985)
@@ -55,7 +55,7 @@ fputs(const char * __restrict s, FILE * 
 	struct __siov iov;
 
 	iov.iov_base = (void *)s;
-	iov.iov_len = uio.uio_resid = strlen(s);
+	uio.uio_resid = iov.iov_len = strlen(s);
 	uio.uio_iov = &iov;
 	uio.uio_iovcnt = 1;
 	FLOCKFILE(fp);

Modified: head/lib/libc/stdio/puts.c
==============================================================================
--- head/lib/libc/stdio/puts.c	Tue Jul 22 16:19:01 2014	(r268984)
+++ head/lib/libc/stdio/puts.c	Tue Jul 22 16:39:11 2014	(r268985)
@@ -51,12 +51,12 @@ int
 puts(char const *s)
 {
 	int retval;
-	size_t c = strlen(s);
+	size_t c;
 	struct __suio uio;
 	struct __siov iov[2];
 
 	iov[0].iov_base = (void *)s;
-	iov[0].iov_len = c;
+	iov[0].iov_len = c = strlen(s);
 	iov[1].iov_base = "\n";
 	iov[1].iov_len = 1;
 	uio.uio_resid = c + 1;