aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-06-13 09:02:29 +0000
committerRoland McGrath <roland@gnu.org>2002-06-13 09:02:29 +0000
commitb83cbb99bdd2019f70ffbcca52e5a977437ed421 (patch)
tree50479b6cadc292f81a8bda58741d86d8b106fbf2
parent8f0ac69e431f560fbb286c41b0c284823e2f53f6 (diff)
downloadglibc-b83cbb99bdd2019f70ffbcca52e5a977437ed421.zip
glibc-b83cbb99bdd2019f70ffbcca52e5a977437ed421.tar.gz
glibc-b83cbb99bdd2019f70ffbcca52e5a977437ed421.tar.bz2
* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start: go): Fix arg type.
* sysdeps/mach/hurd/if_index.c (if_nameindex): Use size_t for AMOUNT argument to pfinet_siocgifconf RPC.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c2
-rw-r--r--sysdeps/mach/hurd/if_index.c13
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b890186..0a8ecbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
(_dl_init_first): Likewise.
(_hurd_stack_setup): Likewise.
(init1): Add a cast.
+ * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start: go): Fix arg type.
+
+ * sysdeps/mach/hurd/if_index.c (if_nameindex): Use size_t for AMOUNT
+ argument to pfinet_siocgifconf RPC.
2002-06-13 Andreas Schwab <schwab@suse.de>
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 4beb3b8..5549559 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -113,7 +113,7 @@ _dl_sysdep_start (void **start_argptr,
void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phent,
ElfW(Addr) *user_entry))
{
- void go (int *argdata)
+ void go (intptr_t *argdata)
{
extern unsigned int _dl_skip_args; /* rtld.c */
char **p;
diff --git a/sysdeps/mach/hurd/if_index.c b/sysdeps/mach/hurd/if_index.c
index 7a58c9c..63dad54 100644
--- a/sysdeps/mach/hurd/if_index.c
+++ b/sysdeps/mach/hurd/if_index.c
@@ -1,5 +1,5 @@
/* Find network interface names and index numbers. Hurd version.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000,01,02 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
@@ -80,7 +80,6 @@ if_nameindex (void)
struct if_nameindex *idx = NULL;
ifc.ifc_buf = data;
- ifc.ifc_len = sizeof (data);
if (fd < 0)
return NULL;
@@ -90,8 +89,8 @@ if_nameindex (void)
nifs = 0;
else
{
- err = __pfinet_siocgifconf (server, -1, &ifc.ifc_buf,
- &ifc.ifc_len);
+ size_t len = sizeof data;
+ err = __pfinet_siocgifconf (server, -1, &ifc.ifc_buf, &len);
if (err == MACH_SEND_INVALID_DEST || err == MIG_SERVER_DIED)
{
/* On the first use of the socket server during the operation,
@@ -99,13 +98,13 @@ if_nameindex (void)
server = _hurd_socket_server (PF_INET, 1);
if (server == MACH_PORT_NULL)
goto out;
- err = __pfinet_siocgifconf (server, -1, &ifc.ifc_buf,
- &ifc.ifc_len);
+ err = __pfinet_siocgifconf (server, -1, &ifc.ifc_buf, &len);
}
if (err)
goto out;
- nifs = ifc.ifc_len / sizeof (struct ifreq);
+ ifc.ifc_len = len;
+ nifs = len / sizeof (struct ifreq);
}
idx = malloc ((nifs + 1) * sizeof (struct if_nameindex));