diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-05-11 14:01:43 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-05-11 14:01:43 +0000 |
| commit | 3ec0d26c76d6905501034692d05bddbabae64e76 (patch) | |
| tree | 191efcdfd934a0369cdef723fe4f650fe2f3dcfc /sysdeps/unix/sysv/linux/ifaddrs.c | |
| parent | 262cf6b3df91d5bb7cbdcae2390333b21e8008d5 (diff) | |
Updated to fedora-glibc-20060511T1325cvs/fedora-glibc-2_4_90-7
Diffstat (limited to 'sysdeps/unix/sysv/linux/ifaddrs.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/ifaddrs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c index f743f702f0..e6720f0ca2 100644 --- a/sysdeps/unix/sysv/linux/ifaddrs.c +++ b/sysdeps/unix/sysv/linux/ifaddrs.c @@ -1,5 +1,5 @@ /* getifaddrs -- get names and addresses of all network interfaces - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -358,8 +358,7 @@ getifaddrs (struct ifaddrs **ifap) ifa_data. */ int result = 0; - if (ifap) - *ifap = NULL; + *ifap = NULL; if (! __no_netlink_support && __netlink_open (&nh) < 0) { @@ -840,8 +839,7 @@ getifaddrs (struct ifaddrs **ifap) memmove (ifas, &ifas[newlink], sizeof (struct ifaddrs_storage)); } - if (ifap != NULL) - *ifap = &ifas[0].ifa; + *ifap = &ifas[0].ifa; exit_free: __netlink_free_handle (&nh); |