summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorray <>2007-05-12 16:18:06 +0000
committerray <>2007-05-12 16:18:06 +0000
commitd09a5dfa6cae4c7b7f1bbcd8831a5c94faacec9e (patch)
tree0b67144652a0ce82667f823b19efacc391522d75 /src/lib
parent09a3319504b2620fcd05dbd9ab7b2918bb2f9699 (diff)
downloadopenbsd-d09a5dfa6cae4c7b7f1bbcd8831a5c94faacec9e.tar.gz
openbsd-d09a5dfa6cae4c7b7f1bbcd8831a5c94faacec9e.tar.bz2
openbsd-d09a5dfa6cae4c7b7f1bbcd8831a5c94faacec9e.zip
Clean up macros according to style. From tbert <bret dot lambert at gmail>.
OK moritz@ and jaredy@.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libc/net/getaddrinfo.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index 10a983afcf..532b2ee2c8 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getaddrinfo.c,v 1.62 2007/05/10 02:14:35 ray Exp $ */ 1/* $OpenBSD: getaddrinfo.c,v 1.63 2007/05/12 16:18:06 ray Exp $ */
2/* $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $ */ 2/* $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $ */
3 3
4/* 4/*
@@ -239,38 +239,38 @@ static struct addrinfo *_dns_getaddrinfo(const char *, const struct addrinfo *);
239 239
240/* XXX macros that make external reference is BAD. */ 240/* XXX macros that make external reference is BAD. */
241 241
242#define GET_AI(ai, afd, addr) \ 242#define GET_AI(ai, afd, addr) \
243do { \ 243do { \
244 /* external reference: pai, error, and label free */ \ 244 /* external reference: pai, error, and label free */ \
245 (ai) = get_ai(pai, (afd), (addr)); \ 245 (ai) = get_ai(pai, (afd), (addr)); \
246 if ((ai) == NULL) { \ 246 if ((ai) == NULL) { \
247 error = EAI_MEMORY; \ 247 error = EAI_MEMORY; \
248 goto free; \ 248 goto free; \
249 } \ 249 } \
250} while (/*CONSTCOND*/0) 250} while (/*CONSTCOND*/0)
251 251
252#define GET_PORT(ai, serv) \ 252#define GET_PORT(ai, serv) \
253do { \ 253do { \
254 /* external reference: error and label free */ \ 254 /* external reference: error and label free */ \
255 error = get_port((ai), (serv), 0); \ 255 error = get_port((ai), (serv), 0); \
256 if (error != 0) \ 256 if (error != 0) \
257 goto free; \ 257 goto free; \
258} while (/*CONSTCOND*/0) 258} while (/*CONSTCOND*/0)
259 259
260#define GET_CANONNAME(ai, str) \ 260#define GET_CANONNAME(ai, str) \
261do { \ 261do { \
262 /* external reference: pai, error and label free */ \ 262 /* external reference: pai, error and label free */ \
263 error = get_canonname(pai, (ai), (str)); \ 263 error = get_canonname(pai, (ai), (str)); \
264 if (error != 0) \ 264 if (error != 0) \
265 goto free; \ 265 goto free; \
266} while (/*CONSTCOND*/0) 266} while (/*CONSTCOND*/0)
267 267
268#define ERR(err) \ 268#define ERR(err) \
269do { \ 269do { \
270 /* external reference: error, and label bad */ \ 270 /* external reference: error, and label bad */ \
271 error = (err); \ 271 error = (err); \
272 goto bad; \ 272 goto bad; \
273 /*NOTREACHED*/ \ 273 /*NOTREACHED*/ \
274} while (/*CONSTCOND*/0) 274} while (/*CONSTCOND*/0)
275 275
276#define MATCH_FAMILY(x, y, w) \ 276#define MATCH_FAMILY(x, y, w) \