RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Error reporting fixed by Jennifer.

Browse Source
This commit is contained in:
Joel Sherrill
1999-05-07 16:30:44 +00:00
parent c34aaae7e6
commit acb644a66f
4 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
c/src/exec/libnetworking/lib/tftpDriver.c
View File

@@ -445,14 +445,14 @@ int rtems_tftp_open(
cp1 = cp2; cp1 = cp2;
while (*cp2 != '/') { while (*cp2 != '/') {
if (*cp2 == '\0') if (*cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
cp2++; cp2++;
} }
len = cp2 - cp1; len = cp2 - cp1;
hostname = malloc (len + 1); hostname = malloc (len + 1);
if (hostname == NULL) if (hostname == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
strncpy (hostname, cp1, len); strncpy (hostname, cp1, len);
hostname[len] = '\0'; hostname[len] = '\0';
@@ -461,14 +461,14 @@ int rtems_tftp_open(
} }
if ((farAddress == 0) || (farAddress == ~0)) if ((farAddress == 0) || (farAddress == ~0))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
if (*++cp2 == '\0') if (*++cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
remoteFilename = cp2; remoteFilename = cp2;
if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10)) if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
/* /*
* Find a free stream * Find a free stream
@@ -476,7 +476,7 @@ int rtems_tftp_open(
sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
for (s = 0 ; s < nStreams ; s++) { for (s = 0 ; s < nStreams ; s++) {
if (tftpStreams[s] == NULL) if (tftpStreams[s] == NULL)
@@ -493,7 +493,7 @@ int rtems_tftp_open(
np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams); np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams);
if (np == NULL) { if (np == NULL) {
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
tftpStreams = np; tftpStreams = np;
} }
@@ -501,7 +501,7 @@ int rtems_tftp_open(
tp = tftpStreams[s] = malloc (sizeof (struct tftpStream)); tp = tftpStreams[s] = malloc (sizeof (struct tftpStream));
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
if (tp == NULL) if (tp == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
iop->data0 = s; iop->data0 = s;
iop->data1 = tp; iop->data1 = tp;
@@ -511,7 +511,7 @@ int rtems_tftp_open(
if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) { if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
releaseStream (s); releaseStream (s);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
/* /*
@@ -538,7 +538,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
} }
} }
@@ -583,7 +583,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
/* /*
@@ -605,7 +605,7 @@ int rtems_tftp_open(
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
break; break;
} }
@@ -616,7 +616,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
* releaseStream (minor); * releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }
@@ -629,7 +629,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }

30
c/src/lib/libnetworking/lib/tftpDriver.c
View File

@@ -445,14 +445,14 @@ int rtems_tftp_open(
cp1 = cp2; cp1 = cp2;
while (*cp2 != '/') { while (*cp2 != '/') {
if (*cp2 == '\0') if (*cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
cp2++; cp2++;
} }
len = cp2 - cp1; len = cp2 - cp1;
hostname = malloc (len + 1); hostname = malloc (len + 1);
if (hostname == NULL) if (hostname == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
strncpy (hostname, cp1, len); strncpy (hostname, cp1, len);
hostname[len] = '\0'; hostname[len] = '\0';
@@ -461,14 +461,14 @@ int rtems_tftp_open(
} }
if ((farAddress == 0) || (farAddress == ~0)) if ((farAddress == 0) || (farAddress == ~0))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
if (*++cp2 == '\0') if (*++cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
remoteFilename = cp2; remoteFilename = cp2;
if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10)) if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
/* /*
* Find a free stream * Find a free stream
@@ -476,7 +476,7 @@ int rtems_tftp_open(
sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
for (s = 0 ; s < nStreams ; s++) { for (s = 0 ; s < nStreams ; s++) {
if (tftpStreams[s] == NULL) if (tftpStreams[s] == NULL)
@@ -493,7 +493,7 @@ int rtems_tftp_open(
np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams); np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams);
if (np == NULL) { if (np == NULL) {
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
tftpStreams = np; tftpStreams = np;
} }
@@ -501,7 +501,7 @@ int rtems_tftp_open(
tp = tftpStreams[s] = malloc (sizeof (struct tftpStream)); tp = tftpStreams[s] = malloc (sizeof (struct tftpStream));
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
if (tp == NULL) if (tp == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
iop->data0 = s; iop->data0 = s;
iop->data1 = tp; iop->data1 = tp;
@@ -511,7 +511,7 @@ int rtems_tftp_open(
if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) { if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
releaseStream (s); releaseStream (s);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
/* /*
@@ -538,7 +538,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
} }
} }
@@ -583,7 +583,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
/* /*
@@ -605,7 +605,7 @@ int rtems_tftp_open(
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
break; break;
} }
@@ -616,7 +616,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
* releaseStream (minor); * releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }
@@ -629,7 +629,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }

30
c/src/libnetworking/lib/tftpDriver.c
View File

@@ -445,14 +445,14 @@ int rtems_tftp_open(
cp1 = cp2; cp1 = cp2;
while (*cp2 != '/') { while (*cp2 != '/') {
if (*cp2 == '\0') if (*cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
cp2++; cp2++;
} }
len = cp2 - cp1; len = cp2 - cp1;
hostname = malloc (len + 1); hostname = malloc (len + 1);
if (hostname == NULL) if (hostname == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
strncpy (hostname, cp1, len); strncpy (hostname, cp1, len);
hostname[len] = '\0'; hostname[len] = '\0';
@@ -461,14 +461,14 @@ int rtems_tftp_open(
} }
if ((farAddress == 0) || (farAddress == ~0)) if ((farAddress == 0) || (farAddress == ~0))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
if (*++cp2 == '\0') if (*++cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
remoteFilename = cp2; remoteFilename = cp2;
if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10)) if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
/* /*
* Find a free stream * Find a free stream
@@ -476,7 +476,7 @@ int rtems_tftp_open(
sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
for (s = 0 ; s < nStreams ; s++) { for (s = 0 ; s < nStreams ; s++) {
if (tftpStreams[s] == NULL) if (tftpStreams[s] == NULL)
@@ -493,7 +493,7 @@ int rtems_tftp_open(
np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams); np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams);
if (np == NULL) { if (np == NULL) {
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
tftpStreams = np; tftpStreams = np;
} }
@@ -501,7 +501,7 @@ int rtems_tftp_open(
tp = tftpStreams[s] = malloc (sizeof (struct tftpStream)); tp = tftpStreams[s] = malloc (sizeof (struct tftpStream));
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
if (tp == NULL) if (tp == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
iop->data0 = s; iop->data0 = s;
iop->data1 = tp; iop->data1 = tp;
@@ -511,7 +511,7 @@ int rtems_tftp_open(
if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) { if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
releaseStream (s); releaseStream (s);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
/* /*
@@ -538,7 +538,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
} }
} }
@@ -583,7 +583,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
/* /*
@@ -605,7 +605,7 @@ int rtems_tftp_open(
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
break; break;
} }
@@ -616,7 +616,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
* releaseStream (minor); * releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }
@@ -629,7 +629,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }

30
cpukit/libnetworking/lib/tftpDriver.c
View File

@@ -445,14 +445,14 @@ int rtems_tftp_open(
cp1 = cp2; cp1 = cp2;
while (*cp2 != '/') { while (*cp2 != '/') {
if (*cp2 == '\0') if (*cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
cp2++; cp2++;
} }
len = cp2 - cp1; len = cp2 - cp1;
hostname = malloc (len + 1); hostname = malloc (len + 1);
if (hostname == NULL) if (hostname == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
strncpy (hostname, cp1, len); strncpy (hostname, cp1, len);
hostname[len] = '\0'; hostname[len] = '\0';
@@ -461,14 +461,14 @@ int rtems_tftp_open(
} }
if ((farAddress == 0) || (farAddress == ~0)) if ((farAddress == 0) || (farAddress == ~0))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
if (*++cp2 == '\0') if (*++cp2 == '\0')
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
remoteFilename = cp2; remoteFilename = cp2;
if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10)) if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10))
set_errno_and_return_minus_one( ENOENT ); return ENOENT;
/* /*
* Find a free stream * Find a free stream
@@ -476,7 +476,7 @@ int rtems_tftp_open(
sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain (tftp_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
for (s = 0 ; s < nStreams ; s++) { for (s = 0 ; s < nStreams ; s++) {
if (tftpStreams[s] == NULL) if (tftpStreams[s] == NULL)
@@ -493,7 +493,7 @@ int rtems_tftp_open(
np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams); np = realloc (tftpStreams, ++nStreams * sizeof *tftpStreams);
if (np == NULL) { if (np == NULL) {
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
tftpStreams = np; tftpStreams = np;
} }
@@ -501,7 +501,7 @@ int rtems_tftp_open(
tp = tftpStreams[s] = malloc (sizeof (struct tftpStream)); tp = tftpStreams[s] = malloc (sizeof (struct tftpStream));
rtems_semaphore_release (tftp_mutex); rtems_semaphore_release (tftp_mutex);
if (tp == NULL) if (tp == NULL)
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
iop->data0 = s; iop->data0 = s;
iop->data1 = tp; iop->data1 = tp;
@@ -511,7 +511,7 @@ int rtems_tftp_open(
if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) { if ((tp->socket = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
releaseStream (s); releaseStream (s);
set_errno_and_return_minus_one( ENOMEM ); return ENOMEM;
} }
/* /*
@@ -538,7 +538,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EBUSY ); return EBUSY;
} }
} }
@@ -583,7 +583,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
/* /*
@@ -605,7 +605,7 @@ int rtems_tftp_open(
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
break; break;
} }
@@ -616,7 +616,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
* releaseStream (minor); * releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }
@@ -629,7 +629,7 @@ int rtems_tftp_open(
* XXX Eric .. how do we get the minor information to release this??? * XXX Eric .. how do we get the minor information to release this???
releaseStream (minor); releaseStream (minor);
*/ */
set_errno_and_return_minus_one( EIO ); return EIO;
} }
} }