diff options
author | eric <> | 2009-07-09 10:14:41 +0000 |
---|---|---|
committer | eric <> | 2009-07-09 10:14:41 +0000 |
commit | d5ad258ccdd800cc1c6af12bd1af6b07330fde25 (patch) | |
tree | f3ce220600beaf78124f9b2b8847425765367f85 /src | |
parent | 2eabc3aa42ad7d46a1723621f8e34e533342f67a (diff) | |
download | openbsd-d5ad258ccdd800cc1c6af12bd1af6b07330fde25.tar.gz openbsd-d5ad258ccdd800cc1c6af12bd1af6b07330fde25.tar.bz2 openbsd-d5ad258ccdd800cc1c6af12bd1af6b07330fde25.zip |
promote correct style for error checking
ok tedu@ deraadt@ krw@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libc/net/getaddrinfo.3 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libc/net/getaddrinfo.3 b/src/lib/libc/net/getaddrinfo.3 index 3e1f16d783..7250407d65 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.46 2009/05/06 19:03:09 jacekm Exp $ | 1 | .\" $OpenBSD: getaddrinfo.3,v 1.47 2009/07/09 10:14:41 eric 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") |
@@ -16,7 +16,7 @@ | |||
16 | .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | 16 | .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
17 | .\" PERFORMANCE OF THIS SOFTWARE. | 17 | .\" PERFORMANCE OF THIS SOFTWARE. |
18 | .\" | 18 | .\" |
19 | .Dd $Mdocdate: May 6 2009 $ | 19 | .Dd $Mdocdate: July 9 2009 $ |
20 | .Dt GETADDRINFO 3 | 20 | .Dt GETADDRINFO 3 |
21 | .Os | 21 | .Os |
22 | .Sh NAME | 22 | .Sh NAME |
@@ -325,12 +325,12 @@ s = -1; | |||
325 | for (res = res0; res; res = res->ai_next) { | 325 | for (res = res0; res; res = res->ai_next) { |
326 | s = socket(res->ai_family, res->ai_socktype, | 326 | s = socket(res->ai_family, res->ai_socktype, |
327 | res->ai_protocol); | 327 | res->ai_protocol); |
328 | if (s < 0) { | 328 | if (s == -1) { |
329 | cause = "socket"; | 329 | cause = "socket"; |
330 | continue; | 330 | continue; |
331 | } | 331 | } |
332 | 332 | ||
333 | if (connect(s, res->ai_addr, res->ai_addrlen) < 0) { | 333 | if (connect(s, res->ai_addr, res->ai_addrlen) == -1) { |
334 | cause = "connect"; | 334 | cause = "connect"; |
335 | save_errno = errno; | 335 | save_errno = errno; |
336 | close(s); | 336 | close(s); |
@@ -341,7 +341,7 @@ for (res = res0; res; res = res->ai_next) { | |||
341 | 341 | ||
342 | break; /* okay we got one */ | 342 | break; /* okay we got one */ |
343 | } | 343 | } |
344 | if (s < 0) | 344 | if (s == -1) |
345 | err(1, "%s", cause); | 345 | err(1, "%s", cause); |
346 | freeaddrinfo(res0); | 346 | freeaddrinfo(res0); |
347 | .Ed | 347 | .Ed |
@@ -368,12 +368,12 @@ nsock = 0; | |||
368 | for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) { | 368 | for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) { |
369 | s[nsock] = socket(res->ai_family, res->ai_socktype, | 369 | s[nsock] = socket(res->ai_family, res->ai_socktype, |
370 | res->ai_protocol); | 370 | res->ai_protocol); |
371 | if (s[nsock] < 0) { | 371 | if (s[nsock] == -1) { |
372 | cause = "socket"; | 372 | cause = "socket"; |
373 | continue; | 373 | continue; |
374 | } | 374 | } |
375 | 375 | ||
376 | if (bind(s[nsock], res->ai_addr, res->ai_addrlen) < 0) { | 376 | if (bind(s[nsock], res->ai_addr, res->ai_addrlen) == -1) { |
377 | cause = "bind"; | 377 | cause = "bind"; |
378 | save_errno = errno; | 378 | save_errno = errno; |
379 | close(s[nsock]); | 379 | close(s[nsock]); |