mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
2533775393
2003-06-13 Ulrich Drepper <drepper@redhat.com> Fixing gcc 3.3 warnings, part II. * argp/argp-help.c (hol_entry_long_iterate): Always inline. * elf/dl-load.c (cache_rpath): Don't inline. * iconvdata/cns11642l2.h: Always inline all functions. * iconvdata/iso-ir-165.h: Likewise. * locale/Makefile (aux): Add coll-lookup. * locale/coll-lookup.c: New file. * locale/coll-lookup.h (collidx_table_lookup): Do not define here. (collseq_table_lookup): Likewise. * locale/weightwc.h: Adjust collidx_table_lookup calls for name change. * posix/fnmatch_loop.c: Adjust collseq_table_lookup calls for name change. * posix/regcomp.c: Likewise. * posix/regexec.c: Likewise. * locale/programs/3level.h (*_get): Always inline. * locale/programs/locfile.h: Move definition of handle_copy to... * locale/programs/locfile.c: ...here. * locale/programs/ld-collate.c (obstack_int32_grow): Always inline. (obstack_int32_grow_fast): Likewise. (utf8_encode): Likewise. (find_element): Avoid aliasing problems. (insert_value): Likewise. (collate_read): Likewise. * nss/getent.c (print_hosts): Don't inline (print_networks): Likewise. (print_shadow): Likewise. (build_doc): Likewise. * nss/nss_files/files-parse.c [ENTDATA] (parser_stclass): Don't inline. * posix/regcomp.c (re_set_fastmap): Always inline. (seek_collating_symbol_entry): Likewise. (lookup_collation_sequence_value): Likewise. (build_range_exp): Likewise. (build_collating_symbol): Likewise. * posix/regexec.c (acquire_init_state_context): Don't inline. (clean_state_log_if_need): Likewise. * resolv/res_send.c (eConsIovec): Rewrite to not return struct and adjust all callers. (evConsTime): Likewise. (evAddTime): Likewise. (evSubTime): Likewise. (evNowTime): Likewise. (evTimeSpec): Removed. (__libc_res_nsend): Avoid aliasing problem. * sysdeps/unix/sysv/linux/ifreq.h: Move old_siocgifconf definition to.. * sysdeps/unix/sysv/linux/ifreq.c: ...here. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (_dl_string_hwcap): Always inline. (_dl_string_platform): Likewise. * wctype/wchar-lookup.h (wctype_table_lookup): Always inline. (wcwidth_table_lookup): Likewise. (wctrans_table_lookup): Likewise. * sysdeps/unix/sysv/linux/sys/epoll.h: Include <stdint.h>.
101 lines
2.4 KiB
C
101 lines
2.4 KiB
C
/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Andreas Jaeger <aj@suse.de>.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include "ifreq.h"
|
|
|
|
/* Variable to signal whether SIOCGIFCONF is not available. */
|
|
#if __ASSUME_SIOCGIFNAME == 0 || 1
|
|
static int old_siocgifconf;
|
|
#else
|
|
# define old_siocgifconf 0
|
|
#endif
|
|
|
|
|
|
void
|
|
__ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
|
|
{
|
|
int fd = sockfd;
|
|
struct ifconf ifc;
|
|
int rq_len;
|
|
int nifs;
|
|
# define RQ_IFS 4
|
|
|
|
if (fd < 0)
|
|
fd = __opensock ();
|
|
if (fd < 0)
|
|
{
|
|
*num_ifs = 0;
|
|
*ifreqs = NULL;
|
|
return;
|
|
}
|
|
|
|
ifc.ifc_buf = NULL;
|
|
|
|
/* We may be able to get the needed buffer size directly, rather than
|
|
guessing. */
|
|
if (! old_siocgifconf)
|
|
{
|
|
ifc.ifc_buf = NULL;
|
|
ifc.ifc_len = 0;
|
|
if (__ioctl (fd, SIOCGIFCONF, &ifc) < 0 || ifc.ifc_len == 0)
|
|
{
|
|
# if __ASSUME_SIOCGIFNAME == 0
|
|
old_siocgifconf = 1;
|
|
# endif
|
|
rq_len = RQ_IFS * sizeof (struct ifreq);
|
|
}
|
|
else
|
|
rq_len = ifc.ifc_len;
|
|
}
|
|
else
|
|
rq_len = RQ_IFS * sizeof (struct ifreq);
|
|
|
|
/* Read all the interfaces out of the kernel. */
|
|
while (1)
|
|
{
|
|
ifc.ifc_len = rq_len;
|
|
ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len);
|
|
if (ifc.ifc_buf == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0)
|
|
{
|
|
if (ifc.ifc_buf)
|
|
free (ifc.ifc_buf);
|
|
|
|
if (fd != sockfd)
|
|
__close (fd);
|
|
|
|
*num_ifs = 0;
|
|
*ifreqs = NULL;
|
|
return;
|
|
}
|
|
|
|
if (!old_siocgifconf || ifc.ifc_len < rq_len)
|
|
break;
|
|
|
|
rq_len *= 2;
|
|
}
|
|
|
|
nifs = ifc.ifc_len / sizeof (struct ifreq);
|
|
|
|
if (fd != sockfd)
|
|
__close (fd);
|
|
|
|
*num_ifs = nifs;
|
|
*ifreqs = realloc (ifc.ifc_buf, nifs * sizeof (struct ifreq));
|
|
}
|