diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-08-21 04:57:22 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-08-21 04:57:22 +0000 |
| commit | 3316af8af2a52d830a3832eed712ff672e602a7c (patch) | |
| tree | 3afd01e09138a35408b1bb5868a24b7d530917f1 /cpukit | |
| parent | 2008-08-21 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-3316af8af2a52d830a3832eed712ff672e602a7c.tar.bz2 | |
2008-08-21 Ralf Corsépius <ralf.corsepius@rtems.org>
* ftpd/ftpd.c: Don't use annonymous unions.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/ftpd/ftpd.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 4089c30105..f87d94c4d9 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,9 @@ 2008-08-21 Ralf Corsépius <ralf.corsepius@rtems.org> + * ftpd/ftpd.c: Don't use annonymous unions. + +2008-08-21 Ralf Corsépius <ralf.corsepius@rtems.org> + * libblock/src/flashdisk.c: Remove bool, true, false. 2008-08-20 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c index 25fd833e60..88b4fdddbe 100644 --- a/cpukit/ftpd/ftpd.c +++ b/cpukit/ftpd/ftpd.c @@ -1441,7 +1441,7 @@ command_port(FTPD_SessionInfo_t *info, char const *args) struct { uint32_t ip; uint16_t port; - }; + } u ; } ip_info; for(i = 0; i < NUM_FIELDS; ++i) @@ -1456,10 +1456,10 @@ command_port(FTPD_SessionInfo_t *info, char const *args) /* Note: while it contradicts with RFC959, we don't allow PORT command * to specify IP address different than those of the originating client * for the sake of safety. */ - if (ip_info.ip == info->def_addr.sin_addr.s_addr) + if (ip_info.u.ip == info->def_addr.sin_addr.s_addr) { - info->data_addr.sin_addr.s_addr = ip_info.ip; - info->data_addr.sin_port = ip_info.port; + info->data_addr.sin_addr.s_addr = ip_info.u.ip; + info->data_addr.sin_port = ip_info.u.port; info->data_addr.sin_family = AF_INET; memset(info->data_addr.sin_zero, 0, sizeof(info->data_addr.sin_zero)); |