Module Name: src
Committed By: christos
Date: Sat Jan 20 16:18:56 UTC 2024
Modified Files:
src/lib/libc/net: getaddrinfo.c
Log Message:
Make the first argument of ip6_str2scopeid const, instead of __UNCONST.
Thanks kre@. While here s/u_int32_t/uint32_t/
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.125 src/lib/libc/net/getaddrinfo.c:1.126
--- src/lib/libc/net/getaddrinfo.c:1.125 Sat Jan 20 09:52:48 2024
+++ src/lib/libc/net/getaddrinfo.c Sat Jan 20 11:18:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.125 2024/01/20 14:52:48 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.126 2024/01/20 16:18:56 christos Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.125 2024/01/20 14:52:48 christos Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.126 2024/01/20 16:18:56 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@@ -196,7 +196,7 @@ struct ai_order {
struct sockaddr aiou_sa;
} aio_src_un;
#define aio_srcsa aio_src_un.aiou_sa
- u_int32_t aio_srcflag;
+ uint32_t aio_srcflag;
int aio_srcscope;
int aio_dstscope;
struct policyqueue *aio_srcpolicy;
@@ -257,7 +257,7 @@ static void set_source(struct ai_order *
struct servent_data *);
static int comp_dst(const void *, const void *);
#ifdef INET6
-static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *);
+static int ip6_str2scopeid(const char *, struct sockaddr_in6 *, uint32_t *);
#endif
static int gai_addr2scopetype(struct sockaddr *);
@@ -921,7 +921,7 @@ set_source(struct ai_order *aio, struct
#ifdef INET6
if (ai.ai_family == AF_INET6) {
struct in6_ifreq ifr6;
- u_int32_t flags6;
+ uint32_t flags6;
memset(&ifr6, 0, sizeof(ifr6));
memcpy(&ifr6.ifr_addr, ai.ai_addr, ai.ai_addrlen);
@@ -1434,13 +1434,13 @@ explore_numeric_scope(const struct addri
error = explore_numeric(pai, addr, servname, res, hostname, svd);
if (error == 0) {
- u_int32_t scopeid;
+ uint32_t scopeid;
for (cur = *res; cur; cur = cur->ai_next) {
if (cur->ai_family != AF_INET6)
continue;
sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr;
- if (ip6_str2scopeid(__UNCONST(scope), sin6, &scopeid)
+ if (ip6_str2scopeid(scope, sin6, &scopeid)
== -1) {
free(hostname2);
return EAI_NODATA; /* XXX: is return OK? */
@@ -1644,7 +1644,7 @@ addrconfig(uint64_t *mask)
#ifdef INET6
/* convert a string to a scope identifier. XXX: IPv6 specific */
static int
-ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid)
+ip6_str2scopeid(const char *scope, struct sockaddr_in6 *sin6, uint32_t *scopeid)
{
u_long lscopeid;
struct in6_addr *a6;
@@ -1684,7 +1684,7 @@ ip6_str2scopeid(char *scope, struct sock
trynumeric:
errno = 0;
lscopeid = strtoul(scope, &ep, 10);
- *scopeid = (u_int32_t)(lscopeid & 0xffffffffUL);
+ *scopeid = (uint32_t)(lscopeid & 0xffffffffUL);
if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid)
return 0;
else
