changeset 1579:9b1c56507dbb

* src/fd.cxx: Fix the assert just added. 0 is a valid fd.
author asl
date Wed, 07 Apr 2004 11:18:53 +0000
parents d4b172576ac4
children e4c676dcd9b0
files packages/io/fileio/current/ChangeLog packages/io/fileio/current/src/fd.cxx
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/packages/io/fileio/current/ChangeLog
+++ b/packages/io/fileio/current/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-07  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/fd.cxx: Fix the assert just added. 0 is a valid fd.
+
 2004-03-25  Sebastien Couret  <sebastien.couret@elios-informatique.fr>
 
 	* src/fd.cxx: Added CYG_ASSERT bound checking for file descriptor
--- a/packages/io/fileio/current/src/fd.cxx
+++ b/packages/io/fileio/current/src/fd.cxx
@@ -177,7 +177,7 @@ static int fd_close( int fd )
     int error = 0;
     cyg_file *fp;
 
-    CYG_ASSERT(((0 < fd) && (fd<CYGNUM_FILEIO_NFD)), "fd out of range");    
+    CYG_ASSERT(((0 <= fd) && (fd<CYGNUM_FILEIO_NFD)), "fd out of range");    
 
     fp = desc[fd];
 
@@ -206,7 +206,7 @@ static int fd_close( int fd )
 {
     int fd;
 
-    CYG_ASSERT(((0 < low) && (low<CYGNUM_FILEIO_NFD)),"fd out of range");
+    CYG_ASSERT(((0 <= low) && (low<CYGNUM_FILEIO_NFD)),"fd out of range");
 
     FILEIO_MUTEX_LOCK(fdlock);
     
@@ -233,7 +233,7 @@ static int fd_close( int fd )
 __externC void cyg_fd_assign(int fd, cyg_file *fp)
 {
 
-    CYG_ASSERT(((0 < fd) && (fd<CYGNUM_FILEIO_NFD)),"fd out of range");
+    CYG_ASSERT(((0 <= fd) && (fd<CYGNUM_FILEIO_NFD)),"fd out of range");
 
     FILEIO_MUTEX_LOCK(fdlock);
 
@@ -253,7 +253,7 @@ static int fd_close( int fd )
 {
     int error;
 
-    CYG_ASSERT(((0 < fd) && (fd<CYGNUM_FILEIO_NFD)),"fd out of range");
+    CYG_ASSERT(((0 <= fd) && (fd<CYGNUM_FILEIO_NFD)),"fd out of range");
     
     FILEIO_MUTEX_LOCK(fdlock);
     
@@ -277,7 +277,7 @@ static int fd_close( int fd )
 
 __externC cyg_file *cyg_fp_get( int fd )
 {
-    CYG_ASSERT(((0 < fd) && (fd<CYGNUM_FILEIO_NFD)),"fd out of range");
+    CYG_ASSERT(((0 <= fd) && (fd<CYGNUM_FILEIO_NFD)),"fd out of range");
 
     FILEIO_MUTEX_LOCK(fdlock);