diff options
author | Jeff Johnston <jjohnstn@redhat.com> | 2004-04-23 20:01:55 +0000 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-04-23 20:01:55 +0000 |
commit | 05b315770a3925648b1a3b52781a75232809198d (patch) | |
tree | 6e791ccfcc9aea4e70f350dce432bdda02a40785 /newlib/libc/stdio/fgets.c | |
parent | 7ed02aabd1ffe4c684bd893c0393f389a8f24643 (diff) | |
download | newlib-05b315770a3925648b1a3b52781a75232809198d.zip newlib-05b315770a3925648b1a3b52781a75232809198d.tar.gz newlib-05b315770a3925648b1a3b52781a75232809198d.tar.bz2 |
2004-04-23 Artem B. Bityuckiy <abitytsky@softminecorp.com>
* libc/stdio/asprintf.c libc/stdio/clearerr.c,
libc/stdio/fclose.c libc/stdio/fcloseall.c libc/stdio/fdopen.c,
libc/stdio/feof.c libc/stdio/ferror.c libc/stdio/fflush.c,
libc/stdio/fgetc.c libc/stdio/fgetpos.c libc/stdio/fgets.c,
libc/stdio/fileno.c libc/stdio/findfp.c libc/stdio/fiprintf.c,
libc/stdio/flags.c libc/stdio/fopen.c libc/stdio/fprintf.c,
libc/stdio/fputc.c libc/stdio/fputs.c libc/stdio/fread.c,
libc/stdio/freopen.c libc/stdio/fscanf.c libc/stdio/fseek.c,
libc/stdio/fseeko.c libc/stdio/fsetpos.c libc/stdio/ftell.c,
libc/stdio/ftello.c libc/stdio/fvwrite.c libc/stdio/fwalk.c,
libc/stdio/fwrite.c libc/stdio/getc.c libc/stdio/getc_u.c,
libc/stdio/getchar.c libc/stdio/getchar_u.c,
libc/stdio/getdelim.c libc/stdio/getline.c libc/stdio/gets.c,
libc/stdio/getw.c libc/stdio/iprintf.c libc/stdio/local.h,
libc/stdio/makebuf.c libc/stdio/mktemp.c libc/stdio/perror.c,
libc/stdio/printf.c libc/stdio/putc.c libc/stdio/putc_u.c,
libc/stdio/putchar.c libc/stdio/putchar_u.c libc/stdio/puts.c,
libc/stdio/putw.c libc/stdio/refill.c libc/stdio/remove.c,
libc/stdio/rename.c libc/stdio/rewind.c libc/stdio/rget.c,
libc/stdio/scanf.c libc/stdio/setbuf.c libc/stdio/setbuffer.c,
libc/stdio/setlinebuf.c libc/stdio/setvbuf.c,
libc/stdio/siprintf.c libc/stdio/snprintf.c,
libc/stdio/sprintf.c libc/stdio/sscanf.c libc/stdio/stdio.c,
libc/stdio/tmpfile.c libc/stdio/tmpnam.c libc/stdio/ungetc.c,
libc/stdio/vasprintf.c libc/stdio/vfieeefp.h,
libc/stdio/vfprintf.c libc/stdio/vfscanf.c,
libc/stdio/vprintf.c libc/stdio/vscanf.c,
libc/stdio/vsnprintf.c libc/stdio/vsprintf.c,
libc/stdio/vsscanf.c libc/stdio/wbuf.c,
libc/stdio/wsetup.c: Perform minor formatting changes. Move
copyright notices to top of file, ensure that <_ansi.h> is
included, be consistent with open parentheses, use _DEFUN macro,
include "local.h" where needed, and remove various compiler
warnings.
Diffstat (limited to 'newlib/libc/stdio/fgets.c')
-rw-r--r-- | newlib/libc/stdio/fgets.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c index 46e1900..8c5147a 100644 --- a/newlib/libc/stdio/fgets.c +++ b/newlib/libc/stdio/fgets.c @@ -16,9 +16,9 @@ */ /* - FUNCTION - <<fgets>>---get character string from a file or stream +<<fgets>>---get character string from a file or stream + INDEX fgets @@ -54,10 +54,10 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>, <<read>>, <<sbrk>>, <<write>>. */ +#include <_ansi.h> #include <stdio.h> #include <string.h> - -extern int __srefill (); +#include "local.h" /* * Read at most n-1 characters from the given file. @@ -66,10 +66,10 @@ extern int __srefill (); */ char * -_DEFUN (fgets, (buf, n, fp), - char *buf _AND - int n _AND - FILE * fp) +_DEFUN(fgets, (buf, n, fp), + char *buf _AND + int n _AND + FILE * fp) { size_t len; char *s; @@ -80,13 +80,13 @@ _DEFUN (fgets, (buf, n, fp), s = buf; - _flockfile(fp); + _flockfile (fp); #ifdef __SCLE if (fp->_flags & __SCLE) { int c; /* Sorry, have to do it the slow way */ - while (--n > 0 && (c = __sgetc(fp)) != EOF) + while (--n > 0 && (c = __sgetc (fp)) != EOF) { *s++ = c; if (c == '\n') @@ -94,11 +94,11 @@ _DEFUN (fgets, (buf, n, fp), } if (c == EOF && s == buf) { - _funlockfile(fp); + _funlockfile (fp); return NULL; } *s = 0; - _funlockfile(fp); + _funlockfile (fp); return buf; } #endif @@ -116,7 +116,7 @@ _DEFUN (fgets, (buf, n, fp), /* EOF: stop with partial or no line */ if (s == buf) { - _funlockfile(fp); + _funlockfile (fp); return 0; } break; @@ -139,18 +139,18 @@ _DEFUN (fgets, (buf, n, fp), len = ++t - p; fp->_r -= len; fp->_p = t; - (void) memcpy ((_PTR) s, (_PTR) p, len); + _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len); s[len] = 0; - _funlockfile(fp); + _funlockfile (fp); return (buf); } fp->_r -= len; fp->_p += len; - (void) memcpy ((_PTR) s, (_PTR) p, len); + _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len); s += len; } while ((n -= len) != 0); *s = 0; - _funlockfile(fp); + _funlockfile (fp); return buf; } |