Mercurial > ecos
changeset 1283:6bb106b4ff93
* src/fio.h (CYG_FILEIO_SIGMASK_SET): Fixed a compiler warning
about an unused variable.
* src/devfs.cxx: prototype of dev_fo_select now matches
implementation
* include/fileio.h: changed definition of cyg_fileop_select to
return a cyg_bool instead of int to match current implementations
* src/misc.cxx: changed cyg_fileio_seltrue() to match prototype.
| author | asl |
|---|---|
| date | Mon, 06 Oct 2003 18:45:22 +0000 |
| parents | 28c8c2fbb86e |
| children | 80ac249615eb |
| files | packages/io/fileio/current/ChangeLog packages/io/fileio/current/include/fileio.h packages/io/fileio/current/src/devfs.cxx packages/io/fileio/current/src/fio.h packages/io/fileio/current/src/misc.cxx |
| diffstat | 5 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/io/fileio/current/ChangeLog +++ b/packages/io/fileio/current/ChangeLog @@ -1,3 +1,15 @@ +2003-10-06 Andrew Lunn <andrew.lunn@ascom.ch> + + * src/fio.h (CYG_FILEIO_SIGMASK_SET): Fixed a compiler warning + about an unused variable. + +2003-09-22 Eric Doenges <Eric.Doenges@DynaPel.com> + * src/devfs.cxx: prototype of dev_fo_select now matches + implementation + * include/fileio.h: changed definition of cyg_fileop_select to + return a cyg_bool instead of int to match current implementations + * src/misc.cxx: changed cyg_fileio_seltrue() to match prototype. + 2003-07-11 Andrew Lunn <andrew.lunn@ascom.ch> * src/socket.cxx (socket): If there are no network stacks configured
--- a/packages/io/fileio/current/include/fileio.h +++ b/packages/io/fileio/current/include/fileio.h @@ -268,7 +268,7 @@ typedef cyg_fileop_readwrite cyg_fileop_ typedef int cyg_fileop_lseek (struct CYG_FILE_TAG *fp, off_t *pos, int whence ); typedef int cyg_fileop_ioctl (struct CYG_FILE_TAG *fp, CYG_ADDRWORD com, CYG_ADDRWORD data); -typedef int cyg_fileop_select (struct CYG_FILE_TAG *fp, int which, CYG_ADDRWORD info); +typedef cyg_bool cyg_fileop_select (struct CYG_FILE_TAG *fp, int which, CYG_ADDRWORD info); typedef int cyg_fileop_fsync (struct CYG_FILE_TAG *fp, int mode ); typedef int cyg_fileop_close (struct CYG_FILE_TAG *fp); typedef int cyg_fileop_fstat (struct CYG_FILE_TAG *fp, struct stat *buf );
--- a/packages/io/fileio/current/src/devfs.cxx +++ b/packages/io/fileio/current/src/devfs.cxx @@ -100,7 +100,7 @@ static int dev_fo_write (struct CYG_ static int dev_fo_lseek (struct CYG_FILE_TAG *fp, off_t *pos, int whence ); static int dev_fo_ioctl (struct CYG_FILE_TAG *fp, CYG_ADDRWORD com, CYG_ADDRWORD data); -static int dev_fo_select (struct CYG_FILE_TAG *fp, int which, CYG_ADDRWORD info); +static cyg_bool dev_fo_select (struct CYG_FILE_TAG *fp, int which, CYG_ADDRWORD info); static int dev_fo_fsync (struct CYG_FILE_TAG *fp, int mode ); static int dev_fo_close (struct CYG_FILE_TAG *fp); static int dev_fo_fstat (struct CYG_FILE_TAG *fp, struct stat *buf );
--- a/packages/io/fileio/current/src/fio.h +++ b/packages/io/fileio/current/src/fio.h @@ -113,7 +113,8 @@ #define CYG_FILEIO_FUNCTION_FINISH() CYG_EMPTY_STATEMENT -#define CYG_FILEIO_SIGMASK_SET( __set, __oset ) CYG_EMPTY_STATEMENT +#define CYG_FILEIO_SIGMASK_SET( __set, __oset ) \ + CYG_UNUSED_PARAM(sigset_t *, __oset) #define CYG_FILEIO_SIGPENDING() (0)
--- a/packages/io/fileio/current/src/misc.cxx +++ b/packages/io/fileio/current/src/misc.cxx @@ -471,7 +471,7 @@ void cyg_fs_unlock( cyg_mtab_entry *mte, __externC int cyg_fileio_enoerr() { return ENOERR; } __externC int cyg_fileio_enotdir() { return ENOTDIR; } -__externC int cyg_fileio_seltrue (struct CYG_FILE_TAG *fp, int which, CYG_ADDRWORD info) +__externC cyg_bool cyg_fileio_seltrue (struct CYG_FILE_TAG *fp, int which, CYG_ADDRWORD info) { return 1; } // -------------------------------------------------------------------------