From 638d4d00fcbfe5af2783c747807f96b68a7c8837 Mon Sep 17 00:00:00 2001 From: delphij Date: Mon, 2 May 2005 10:31:27 +0000 Subject: Cleanups for gcc4: - Use socklen_t for socket functions - Remove an unnecessary extern - Signed/unsigned cleanups Reviewed by: harti --- sbin/atm/atm/atm.h | 1 - sbin/atm/atmconfig/atmconfig_device.h | 2 +- sbin/atm/ilmid/ilmid.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h index 7ecae34..09f5c87 100644 --- a/sbin/atm/atm/atm.h +++ b/sbin/atm/atm/atm.h @@ -191,6 +191,5 @@ size_t compress_prefix_list(struct in_addr *, size_t); void check_netif_name(const char *); void sock_error(int); -extern const struct proto protos[]; extern const struct aal aals[]; extern const struct encaps encaps[]; diff --git a/sbin/atm/atmconfig/atmconfig_device.h b/sbin/atm/atmconfig/atmconfig_device.h index b96467e..1c099fc 100644 --- a/sbin/atm/atmconfig/atmconfig_device.h +++ b/sbin/atm/atmconfig/atmconfig_device.h @@ -45,7 +45,7 @@ struct atmif { TAILQ_ENTRY(atmif) link; uint64_t found; int32_t index; - u_char *ifname; + char *ifname; size_t ifnamelen; uint32_t pcr; int32_t media; diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c index f33212c..4a1e5ec 100644 --- a/sbin/atm/ilmid/ilmid.c +++ b/sbin/atm/ilmid/ilmid.c @@ -1875,7 +1875,7 @@ static void get_local_ip (int s, long *aval) { char intf_name[IFNAMSIZ]; - int namelen = IFNAMSIZ; + socklen_t namelen = IFNAMSIZ; struct air_netif_rsp *net_info = NULL; struct sockaddr_in *sain; @@ -2468,7 +2468,7 @@ ilmi_do_state(void) close ( ilmi_fd[intf] ); ilmi_fd[intf] = -1; } else { - bpp = (caddr_t)&buf[1]; + bpp = &buf[1]; Hdr = asn_get_header(&bpp); if ( Log && Debug_Level > 1 ) -- cgit v1.1