diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2006-06-15 20:08:09 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2006-06-15 20:08:09 +0400 |
| commit | c8956c6fecf0d1390241eefc6a95f9c97fab1e7e (patch) | |
| tree | 67e143facf420f5e6e3adef823990b7ddeae01db /newlib | |
| parent | dac1814fbeb9b9bcc61a3d90159ddda7f7471ba7 (diff) | |
2006-06-15 Corinna Vinschen <corinna@vinschen.de>
* libc/include/stdio.h (__sgetc_r): Fix typo.
* libc/stdio/fread.c (_fread_r): Convert crlf calls to crlf_r.
* libc/stdio/rget.c (__srbuf): Reinstantiate.
* libc/stdio/wbuf.c (__swbuf): Ditto.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 7 | ||||
| -rw-r--r-- | newlib/libc/include/stdio.h | 2 | ||||
| -rw-r--r-- | newlib/libc/stdio/fread.c | 6 | ||||
| -rw-r--r-- | newlib/libc/stdio/rget.c | 10 | ||||
| -rw-r--r-- | newlib/libc/stdio/wbuf.c | 11 |
5 files changed, 32 insertions, 4 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 975438709..f62c61946 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2006-06-15 Corinna Vinschen <corinna@vinschen.de> + + * libc/include/stdio.h (__sgetc_r): Fix typo. + * libc/stdio/fread.c (_fread_r): Convert crlf calls to crlf_r. + * libc/stdio/rget.c (__srbuf): Reinstantiate. + * libc/stdio/wbuf.c (__swbuf): Ditto. + 2006-06-14 Jeff Johnston <jjohnstn@redhat.com> * libc/include/stdio.h: Add new reentrant I/O prototypes for diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index fb132f6af..9f260214c 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -402,7 +402,7 @@ FILE *_EXFUN(funopen,(const _PTR _cookie, #define __sgetc_raw_r(__ptr, __f) (--(__f)->_r < 0 ? __srget_r(__ptr, __f) : (int)(*(__f)->_p++)) #ifdef __SCLE -static __inline__ int __sgetc_r(struct _REENT *__ptr, FILE *__p) +static __inline__ int __sgetc_r(struct _reent *__ptr, FILE *__p) { int __c = __sgetc_raw_r(__ptr, __p); if ((__p->_flags & __SCLE) && (__c == '\r')) diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c index 8df577006..d87d9f966 100644 --- a/newlib/libc/stdio/fread.c +++ b/newlib/libc/stdio/fread.c @@ -196,7 +196,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), if (fp->_flags & __SCLE) { _funlockfile (fp); - return crlf (fp, buf, total-resid, 1) / size; + return crlf_r (ptr, fp, buf, total-resid, 1) / size; } #endif _funlockfile (fp); @@ -221,7 +221,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), if (fp->_flags & __SCLE) { _funlockfile (fp); - return crlf (fp, buf, total-resid, 1) / size; + return crlf_r (ptr, fp, buf, total-resid, 1) / size; } #endif _funlockfile (fp); @@ -238,7 +238,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), if (fp->_flags & __SCLE) { _funlockfile (fp); - return crlf(fp, buf, total, 0) / size; + return crlf_r(ptr, fp, buf, total, 0) / size; } #endif _funlockfile (fp); diff --git a/newlib/libc/stdio/rget.c b/newlib/libc/stdio/rget.c index 1c0bc474c..0444acee3 100644 --- a/newlib/libc/stdio/rget.c +++ b/newlib/libc/stdio/rget.c @@ -43,3 +43,13 @@ _DEFUN(__srget_r, (ptr, fp), } return EOF; } + +/* This function isn't any longer declared in stdio.h, but it's + required for backward compatibility with applications built against + earlier dynamically built newlib libraries. */ +int +_DEFUN(__srget, (fp), + register FILE *fp) +{ + return __srget_r (_REENT, fp); +} diff --git a/newlib/libc/stdio/wbuf.c b/newlib/libc/stdio/wbuf.c index 95d0e4d71..0d2b72ea1 100644 --- a/newlib/libc/stdio/wbuf.c +++ b/newlib/libc/stdio/wbuf.c @@ -85,3 +85,14 @@ _DEFUN(__swbuf_r, (ptr, c, fp), return EOF; return c; } + +/* This function isn't any longer declared in stdio.h, but it's + required for backward compatibility with applications built against + earlier dynamically built newlib libraries. */ +int +_DEFUN(__swbuf, (c, fp), + register int c _AND + register FILE *fp) +{ + return __swbuf_r (_REENT, c, fp); +} |