diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libc/net/getaddrinfo.3 | 18 | ||||
| -rw-r--r-- | src/lib/libc/net/getnameinfo.3 | 10 |
2 files changed, 8 insertions, 20 deletions
diff --git a/src/lib/libc/net/getaddrinfo.3 b/src/lib/libc/net/getaddrinfo.3 index 12a0d8ce12..8b9026820f 100644 --- a/src/lib/libc/net/getaddrinfo.3 +++ b/src/lib/libc/net/getaddrinfo.3 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: getaddrinfo.3,v 1.43 2005/11/15 19:35:31 otto Exp $ | 1 | .\" $OpenBSD: getaddrinfo.3,v 1.44 2006/09/25 23:02:43 ray Exp $ |
| 2 | .\" $KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $ | 2 | .\" $KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $ |
| 3 | .\" | 3 | .\" |
| 4 | .\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") | 4 | .\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") |
| @@ -312,10 +312,8 @@ memset(&hints, 0, sizeof(hints)); | |||
| 312 | hints.ai_family = PF_UNSPEC; | 312 | hints.ai_family = PF_UNSPEC; |
| 313 | hints.ai_socktype = SOCK_STREAM; | 313 | hints.ai_socktype = SOCK_STREAM; |
| 314 | error = getaddrinfo("www.kame.net", "www", &hints, &res0); | 314 | error = getaddrinfo("www.kame.net", "www", &hints, &res0); |
| 315 | if (error) { | 315 | if (error) |
| 316 | errx(1, "%s", gai_strerror(error)); | 316 | errx(1, "%s", gai_strerror(error)); |
| 317 | /*NOTREACHED*/ | ||
| 318 | } | ||
| 319 | s = -1; | 317 | s = -1; |
| 320 | for (res = res0; res; res = res->ai_next) { | 318 | for (res = res0; res; res = res->ai_next) { |
| 321 | s = socket(res->ai_family, res->ai_socktype, | 319 | s = socket(res->ai_family, res->ai_socktype, |
| @@ -336,10 +334,8 @@ for (res = res0; res; res = res->ai_next) { | |||
| 336 | 334 | ||
| 337 | break; /* okay we got one */ | 335 | break; /* okay we got one */ |
| 338 | } | 336 | } |
| 339 | if (s < 0) { | 337 | if (s < 0) |
| 340 | err(1, "%s", cause); | 338 | err(1, "%s", cause); |
| 341 | /*NOTREACHED*/ | ||
| 342 | } | ||
| 343 | freeaddrinfo(res0); | 339 | freeaddrinfo(res0); |
| 344 | .Ed | 340 | .Ed |
| 345 | .Pp | 341 | .Pp |
| @@ -359,10 +355,8 @@ hints.ai_family = PF_UNSPEC; | |||
| 359 | hints.ai_socktype = SOCK_STREAM; | 355 | hints.ai_socktype = SOCK_STREAM; |
| 360 | hints.ai_flags = AI_PASSIVE; | 356 | hints.ai_flags = AI_PASSIVE; |
| 361 | error = getaddrinfo(NULL, "www", &hints, &res0); | 357 | error = getaddrinfo(NULL, "www", &hints, &res0); |
| 362 | if (error) { | 358 | if (error) |
| 363 | errx(1, "%s", gai_strerror(error)); | 359 | errx(1, "%s", gai_strerror(error)); |
| 364 | /*NOTREACHED*/ | ||
| 365 | } | ||
| 366 | nsock = 0; | 360 | nsock = 0; |
| 367 | for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) { | 361 | for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) { |
| 368 | s[nsock] = socket(res->ai_family, res->ai_socktype, | 362 | s[nsock] = socket(res->ai_family, res->ai_socktype, |
| @@ -383,10 +377,8 @@ for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) { | |||
| 383 | 377 | ||
| 384 | nsock++; | 378 | nsock++; |
| 385 | } | 379 | } |
| 386 | if (nsock == 0) { | 380 | if (nsock == 0) |
| 387 | err(1, "%s", cause); | 381 | err(1, "%s", cause); |
| 388 | /*NOTREACHED*/ | ||
| 389 | } | ||
| 390 | freeaddrinfo(res0); | 382 | freeaddrinfo(res0); |
| 391 | .Ed | 383 | .Ed |
| 392 | .Sh SEE ALSO | 384 | .Sh SEE ALSO |
diff --git a/src/lib/libc/net/getnameinfo.3 b/src/lib/libc/net/getnameinfo.3 index b17f2e4aeb..726aa0a994 100644 --- a/src/lib/libc/net/getnameinfo.3 +++ b/src/lib/libc/net/getnameinfo.3 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: getnameinfo.3,v 1.38 2005/01/29 00:49:47 jmc Exp $ | 1 | .\" $OpenBSD: getnameinfo.3,v 1.39 2006/09/25 23:02:43 ray Exp $ |
| 2 | .\" $KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $ | 2 | .\" $KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $ |
| 3 | .\" | 3 | .\" |
| 4 | .\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") | 4 | .\" Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") |
| @@ -137,10 +137,8 @@ struct sockaddr *sa; /* input */ | |||
| 137 | char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; | 137 | char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; |
| 138 | 138 | ||
| 139 | if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf, | 139 | if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf, |
| 140 | sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) { | 140 | sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) |
| 141 | errx(1, "could not get numeric hostname"); | 141 | errx(1, "could not get numeric hostname"); |
| 142 | /*NOTREACHED*/ | ||
| 143 | } | ||
| 144 | printf("host=%s, serv=%s\en", hbuf, sbuf); | 142 | printf("host=%s, serv=%s\en", hbuf, sbuf); |
| 145 | .Ed | 143 | .Ed |
| 146 | .Pp | 144 | .Pp |
| @@ -150,10 +148,8 @@ struct sockaddr *sa; /* input */ | |||
| 150 | char hbuf[NI_MAXHOST]; | 148 | char hbuf[NI_MAXHOST]; |
| 151 | 149 | ||
| 152 | if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0, | 150 | if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0, |
| 153 | NI_NAMEREQD)) { | 151 | NI_NAMEREQD)) |
| 154 | errx(1, "could not resolve hostname"); | 152 | errx(1, "could not resolve hostname"); |
| 155 | /*NOTREACHED*/ | ||
| 156 | } | ||
| 157 | printf("host=%s\en", hbuf); | 153 | printf("host=%s\en", hbuf); |
| 158 | .Ed | 154 | .Ed |
| 159 | .Sh SEE ALSO | 155 | .Sh SEE ALSO |
