aboutsummaryrefslogtreecommitdiff
path: root/newlib/libc/stdio/fvwrite.c
diff options
context:
space:
mode:
Diffstat (limited to 'newlib/libc/stdio/fvwrite.c')
-rw-r--r--newlib/libc/stdio/fvwrite.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index aaf3a19..3143b01 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -1,5 +1,3 @@
-/* No user fns here. Pesch 15apr92. */
-
/*
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -16,7 +14,9 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+/* No user fns here. Pesch 15apr92. */
+#include <_ansi.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -24,7 +24,7 @@
#include "fvwrite.h"
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define COPY(n) (void) memmove((void *) fp->_p, (void *) p, (size_t) (n))
+#define COPY(n) _CAST_VOID memmove ((_PTR) fp->_p, (_PTR) p, (size_t) (n))
#define GETIOV(extra_work) \
while (len == 0) \
@@ -43,12 +43,12 @@
*/
int
-__sfvwrite (fp, uio)
- register FILE *fp;
- register struct __suio *uio;
+_DEFUN(__sfvwrite, (fp, uio),
+ register FILE *fp _AND
+ register struct __suio *uio)
{
register size_t len;
- register _CONST char *p;
+ register _CONST char *p = NULL;
register struct __siov *iov;
register int w, s;
char *nl;
@@ -72,7 +72,7 @@ __sfvwrite (fp, uio)
GETIOV (;);
while (len > 0)
{
- if (putc(*p, fp) == EOF)
+ if (putc (*p, fp) == EOF)
return EOF;
p++;
len--;
@@ -181,12 +181,13 @@ __sfvwrite (fp, uio)
* that the amount to write is MIN(len,nldist).
*/
nlknown = 0;
+ nldist = 0;
do
{
GETIOV (nlknown = 0);
if (!nlknown)
{
- nl = memchr ((void *) p, '\n', len);
+ nl = memchr ((_PTR) p, '\n', len);
nldist = nl ? nl + 1 - p : len + 1;
nlknown = 1;
}