diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-12 12:50:25 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-12 12:50:25 +0000 |
commit | 959e0a0a80c365e6abed7fbcfa6d7a2d16498e85 (patch) | |
tree | 8b3adc6af7db7492b84ef253f03a63d2d4b4f4b7 /cpukit | |
parent | 2010-04-12 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-959e0a0a80c365e6abed7fbcfa6d7a2d16498e85.tar.bz2 |
2010-04-12 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/lib/ftpfs.c: 16bit target fixes:
Use ioctl_command_t as arg to rtems_ftpfs_do_ioctl.
Explicitly cast to uint32_t in char[] to uint32_t
conversion.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 7 | ||||
-rw-r--r-- | cpukit/libnetworking/lib/ftpfs.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index bf88e6e9fa..cecd841757 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,12 @@ 2010-04-12 Ralf Corsépius <ralf.corsepius@rtems.org> + * libnetworking/lib/ftpfs.c: 16bit target fixes: + Use ioctl_command_t as arg to rtems_ftpfs_do_ioctl. + Explicitly cast to uint32_t in char[] to uint32_t + conversion. + +2010-04-12 Ralf Corsépius <ralf.corsepius@rtems.org> + * configure.ac: Check for sched.h. * configure.ac: Check for WORD_BIT, LONG_BIT. * configure.ac: Check for flockfile, funlockfile, ftrylockfile. diff --git a/cpukit/libnetworking/lib/ftpfs.c b/cpukit/libnetworking/lib/ftpfs.c index 2af6c51c1e..bba93b02e0 100644 --- a/cpukit/libnetworking/lib/ftpfs.c +++ b/cpukit/libnetworking/lib/ftpfs.c @@ -159,7 +159,7 @@ rtems_status_code rtems_ftpfs_mount( const char *mount_point) static rtems_status_code rtems_ftpfs_do_ioctl( const char *mount_point, - int req, + ioctl_command_t req, ... ) { @@ -926,8 +926,8 @@ static int rtems_ftpfs_open_data_connection_passive( if (reply != RTEMS_FTPFS_REPLY_2) { return ENOTSUP; } - data_address = (uint32_t) ((pe.data [0] << 24) + (pe.data [1] << 16) - + (pe.data [2] << 8) + pe.data [3]); + data_address = ((uint32_t)(pe.data [0]) << 24) + ((uint32_t)(pe.data [1]) << 16) + + ((uint32_t)(pe.data [2]) << 8) + ((uint32_t)(pe.data [3])); data_port = (uint16_t) ((pe.data [4] << 8) + pe.data [5]); rtems_ftpfs_create_address( &sa, htonl( data_address), htons( data_port)); DEBUG_PRINTF( |