summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--newlib/ChangeLog8
-rw-r--r--newlib/libc/stdio/fwalk.c8
-rw-r--r--newlib/libc/stdio/local.h2
3 files changed, 13 insertions, 5 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 0cc84c957..6c2c4c4eb 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-28 Artem B. Bityuckiy <abitytsky@softminecorp.com>
+
+ * libc/stdio/local.h (_fwalk_reent): Specify prototype of
+ function pointer argument.
+ * libc/stdio/fwalk.c (_fwalk, _fwalk_reent): Change prototypes
+ to specify function pointer arguments.
+ (__fwalk, __fwalk_reent): Ditto.
+
2004-04-26 Aldy Hernandez <aldyh@redhat.com>
* libc/machine/powerpc/vfscanf.c (__svfscanf_r): Fix typo in
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index 87cebdbfe..bb43cf2f3 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -30,7 +30,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
static int
_DEFUN(__fwalk, (ptr, function),
struct _reent *ptr _AND
- register int (*function) ())
+ register int (*function) (FILE *))
{
register FILE *fp;
register int n, ret = 0;
@@ -54,7 +54,7 @@ _DEFUN(__fwalk, (ptr, function),
static int
_DEFUN(__fwalk_reent, (ptr, reent_function),
struct _reent *ptr _AND
- register int (*reent_function) ())
+ register int (*reent_function) (struct _reent *, FILE *))
{
register FILE *fp;
register int n, ret = 0;
@@ -76,7 +76,7 @@ _DEFUN(__fwalk_reent, (ptr, reent_function),
int
_DEFUN(_fwalk, (ptr, function),
struct _reent *ptr _AND
- register int (*function)())
+ register int (*function)(FILE *))
{
register int ret = 0;
@@ -99,7 +99,7 @@ _DEFUN(_fwalk, (ptr, function),
int
_DEFUN(_fwalk_reent, (ptr, reent_function),
struct _reent *ptr _AND
- register int (*reent_function) ())
+ register int (*reent_function) (struct _reent *, FILE *))
{
register int ret = 0;
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 809bbc2d2..e3d5da573 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -41,7 +41,7 @@ extern _VOID _EXFUN(__sinit,(struct _reent *));
extern _VOID _EXFUN(_cleanup_r,(struct _reent *));
extern _VOID _EXFUN(__smakebuf,(FILE *));
extern int _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
-extern int _EXFUN(_fwalk_reent,(struct _reent *, int (*)(FILE *)));
+extern int _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
extern int _EXFUN(__srefill,(FILE *fp));