summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2014-07-22 16:39:11 +0000
committerpfg <pfg@FreeBSD.org>2014-07-22 16:39:11 +0000
commit1e99f060b1397299290b06cd3726c08865bb3c6b (patch)
tree2a00a93e1c3bf5fdee979ac8e782d0f88adf9a27
parente0b7f18a537606e35fce0c30a67f5914f676ae52 (diff)
downloadFreeBSD-src-1e99f060b1397299290b06cd3726c08865bb3c6b.zip
FreeBSD-src-1e99f060b1397299290b06cd3726c08865bb3c6b.tar.gz
Mostly cosmetic cleanups.
In fputs() avoid implcit casting on iov.iov_len. MFC after: 3 days
-rw-r--r--lib/libc/stdio/fputs.c2
-rw-r--r--lib/libc/stdio/puts.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index 3b8f2c9..32e5764 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -55,7 +55,7 @@ fputs(const char * __restrict s, FILE * __restrict fp)
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);
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 5ee7fc1..124afc7 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -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;
OpenPOWER on IntegriCloud