diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-04 18:25:27 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-04 18:25:27 +0000 |
commit | d4651e4104b33dd6683671302524f0bec3bd1cb7 (patch) | |
tree | 15e8ed8ea57830313fd82d823c18ed31599549bf /c/src/libnetworking/lib/tftpDriver.c | |
parent | 2002-01-04 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-d4651e4104b33dd6683671302524f0bec3bd1cb7.tar.bz2 |
2002-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* lib/tftpDriver.c: Remove set_errno_and_return_minus_one, include
<rtems/seterr.h>.
Diffstat (limited to 'c/src/libnetworking/lib/tftpDriver.c')
-rw-r--r-- | c/src/libnetworking/lib/tftpDriver.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/c/src/libnetworking/lib/tftpDriver.c b/c/src/libnetworking/lib/tftpDriver.c index e3367177c6..d7626d601f 100644 --- a/c/src/libnetworking/lib/tftpDriver.c +++ b/c/src/libnetworking/lib/tftpDriver.c @@ -25,17 +25,13 @@ #include <rtems.h> #include <rtems/libio.h> #include <rtems/libio_.h> +#include <rtems/seterr.h> #include <rtems/rtems_bsdnet.h> #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#ifndef set_errno_and_return_minus_one -#define set_errno_and_return_minus_one( _error ) \ - do { errno = (_error); return -1; } while(0) -#endif - #ifdef RTEMS_TFTP_DRIVER_DEBUG int rtems_tftp_driver_debug = 1; #endif @@ -228,7 +224,7 @@ static int rtems_tftp_mount_me( ); if (sc != RTEMS_SUCCESSFUL) - set_errno_and_return_minus_one( ENOMEM ); + rtems_set_errno_and_return_minus_one( ENOMEM ); return 0; } @@ -431,7 +427,7 @@ static int rtems_tftp_evaluate_for_make( ) { pathloc->node_access = NULL; - set_errno_and_return_minus_one( EIO ); + rtems_set_errno_and_return_minus_one( EIO ); } /* @@ -508,18 +504,18 @@ static int rtems_tftp_eval_path( * Reject attempts to open() directories */ if (flags & RTEMS_LIBIO_PERMS_RDWR) - set_errno_and_return_minus_one( EISDIR ); + rtems_set_errno_and_return_minus_one( EISDIR ); if (isRelative) { cp = malloc (strlen(pathloc->node_access)+strlen(pathname)+1); if (cp == NULL) - set_errno_and_return_minus_one( ENOMEM ); + rtems_set_errno_and_return_minus_one( ENOMEM ); strcpy (cp, pathloc->node_access); strcat (cp, pathname); } else { cp = strdup (pathname); if (cp == NULL) - set_errno_and_return_minus_one( ENOMEM ); + rtems_set_errno_and_return_minus_one( ENOMEM ); } fixPath (cp); pathloc->node_access = cp; @@ -533,7 +529,7 @@ static int rtems_tftp_eval_path( */ flags &= RTEMS_LIBIO_PERMS_READ | RTEMS_LIBIO_PERMS_WRITE; if ((flags != RTEMS_LIBIO_PERMS_READ) && (flags != RTEMS_LIBIO_PERMS_WRITE) ) - set_errno_and_return_minus_one( EINVAL ); + rtems_set_errno_and_return_minus_one( EINVAL ); return 0; } @@ -847,20 +843,20 @@ static int rtems_tftp_read( tp->eof = (tp->nleft < TFTP_BUFSIZE); tp->blocknum++; if (sendAck (tp) != 0) - set_errno_and_return_minus_one( EIO ); + rtems_set_errno_and_return_minus_one( EIO ); break; } if (opcode == TFTP_OPCODE_ERROR) - set_errno_and_return_minus_one( tftpErrno (tp) ); + rtems_set_errno_and_return_minus_one( tftpErrno (tp) ); } /* * Keep trying? */ if (++retryCount == IO_RETRY_LIMIT) - set_errno_and_return_minus_one( EIO ); + rtems_set_errno_and_return_minus_one( EIO ); if (sendAck (tp) != 0) - set_errno_and_return_minus_one( EIO ); + rtems_set_errno_and_return_minus_one( EIO ); } } return count - nwant; @@ -977,7 +973,7 @@ static int rtems_tftp_write( int e = rtems_tftp_flush (tp); if (e) { tp->writing = 0; - set_errno_and_return_minus_one (e); + rtems_set_errno_and_return_minus_one (e); } } } |