{"id":810213,"url":"http://patchwork.ozlabs.org/api/patches/810213/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/20170905160530.19525-2-stlman@poczta.fm/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170905160530.19525-2-stlman@poczta.fm>","list_archive_url":null,"date":"2017-09-05T16:05:27","name":"[RFC,1/4,BZ,17083] getaddrinfo: Add comments for #else and #endif directives","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f74aaf93bff1f35f1ecdd7baba2ca791409a6d9d","submitter":{"id":72297,"url":"http://patchwork.ozlabs.org/api/people/72297/?format=json","name":"Łukasz Stelmach","email":"stlman@poczta.fm"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/20170905160530.19525-2-stlman@poczta.fm/mbox/","series":[{"id":1605,"url":"http://patchwork.ozlabs.org/api/series/1605/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=1605","date":"2017-09-05T16:05:26","name":"Make getaddrinfo(3) return zone id from /etc/hosts for link-local IPv6 addresses","version":1,"mbox":"http://patchwork.ozlabs.org/series/1605/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810213/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810213/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-84191-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"o/VM7meT\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xms5t0Xbbz9ryk\n\tfor ;\n\tWed, 6 Sep 2017 02:06:25 +1000 (AEST)","(qmail 117717 invoked by alias); 5 Sep 2017 16:06:17 -0000","(qmail 117650 invoked by uid 89); 5 Sep 2017 16:06:17 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-type:content-transfer-encoding;\n\tq=dns; s=default; b=fx+whuXaL7QmW9EdFCXNBMQ7HFhMmWcxLAq2IQULKO9\n\t4L0QmAuAl0nKR2oXwKdomvc17XuPF7h4N+wHWEu8oju4oiARvyNrX8no7m7rcr2c\n\tiiAGu0r1XSQURo7Eon1qKz9d7qbvtU/sB50ohGtu/nYlcIjNTltSXOBhoOt6c900\n\t=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-type:content-transfer-encoding;\n\ts=default; bh=ompHDxv7UiGT45NLsoewRIWHarw=; b=o/VM7meTeSH1OhRSD\n\tfoCzYXV0Cl5aSQVgPXQyJaad/LsJRiozW44eOx5LD8Cf8fBgnGNCC0fY/zgxlWZ8\n\tIIKT4zOodSFX6q+7Rq8v0rmmpUFL7apDXK6iZCJ6Mjw8yZGXx0Izo5bamtKr8L8J\n\tq2POE1W18WfpBmFTSlC9nMdVBE=","Mailing-List":"contact libc-alpha-help@sourceware.org; run by ezmlm","Precedence":"bulk","List-Id":"","List-Unsubscribe":"","List-Subscribe":"","List-Archive":"","List-Post":"","List-Help":",\n\t","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-24.9 required=5.0 tests=AWL, BAYES_00,\n\tFREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2,\n\tGIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=canon","X-HELO":"smtpo.poczta.interia.pl","X-Interia-R":"Interia","X-Interia-R-IP":"89.64.33.181","X-Interia-R-Helo":"","From":"=?utf-8?q?=C5=81ukasz_Stelmach?= ","To":"libc-alpha@sourceware.org","Cc":"=?utf-8?q?=C5=81ukasz_Stelmach?= ","Subject":"[RFC][PATCH 1/4][BZ 17083] getaddrinfo: Add comments for #else and\n\t#endif directives","Date":"Tue, 5 Sep 2017 18:05:27 +0200","Message-Id":"<20170905160530.19525-2-stlman@poczta.fm>","In-Reply-To":"<20170905160530.19525-1-stlman@poczta.fm>","References":"<20170905160530.19525-1-stlman@poczta.fm>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Interia-Antivirus":"OK","X-IPL-POID":"4","X-IPL-SAS-SPAS":"-0.6","X-IPL-SAS-UREP":"0","X-IPL-SAS-UREP-PRIV":"0","X-IPL-Envelope-To":"stlman@poczta.fm"},"content":"Add comments after #else and #endif directives to help matching them\nwith appropriate #ifdef lines.\n\nFix a typo in a comment block.\n\nSigned-off-by: Łukasz Stelmach \n---\n sysdeps/posix/getaddrinfo.c | 28 ++++++++++++++--------------\n 1 file changed, 14 insertions(+), 14 deletions(-)","diff":"diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c\nindex ce099bdf9c..4b4e192e89 100644\n--- a/sysdeps/posix/getaddrinfo.c\n+++ b/sysdeps/posix/getaddrinfo.c\n@@ -90,7 +90,7 @@ extern int __idna_to_ascii_lz (const char *input, char **output, int flags);\n extern int __idna_to_unicode_lzlz (const char *input, char **output,\n \t\t\t\t int flags);\n # include \n-#endif\n+#endif\t/* HAVE_LIBIDN */\n \n struct gaih_service\n {\n@@ -129,14 +129,14 @@ static const struct gaih_typeproto gaih_inet_typeproto[] =\n { SOCK_DGRAM, IPPROTO_UDP, 0, true, \"udp\" },\n #if defined SOCK_DCCP && defined IPPROTO_DCCP\n { SOCK_DCCP, IPPROTO_DCCP, 0, false, \"dccp\" },\n-#endif\n+#endif\t/* SOCK_DCCP && IPPROTO_DCCP */\n #ifdef IPPROTO_UDPLITE\n { SOCK_DGRAM, IPPROTO_UDPLITE, 0, false, \"udplite\" },\n-#endif\n+#endif\t/* IPPROTO_UDPLITE */\n #ifdef IPPROTO_SCTP\n { SOCK_STREAM, IPPROTO_SCTP, 0, false, \"sctp\" },\n { SOCK_SEQPACKET, IPPROTO_SCTP, 0, false, \"sctp\" },\n-#endif\n+#endif\t/* IPPROTO_SCTP */\n { SOCK_RAW, 0, GAI_PROTO_PROTOANY|GAI_PROTO_NOSERVICE, true, \"raw\" },\n { 0, 0, 0, false, \"\" }\n };\n@@ -505,7 +505,7 @@ gaih_inet (const char *name, const struct gaih_service *service,\n \t malloc_name = true;\n \t }\n \t}\n-#endif\n+#endif\t/* HAVE_LIBIDN */\n \n if (__inet_aton (name, (struct in_addr *) at->addr) != 0)\n \t{\n@@ -753,7 +753,7 @@ gaih_inet (const char *name, const struct gaih_service *service,\n \t\t goto free_and_return;\n \t\t}\n \t }\n-#endif\n+#endif\t/* USE_NSCD */\n \n \t if (__nss_hosts_database == NULL)\n \t no_more = __nss_database_lookup (\"hosts\", NULL,\n@@ -1060,11 +1060,11 @@ gaih_inet (const char *name, const struct gaih_service *service,\n \t\tcanon = out;\n \t }\n \t else\n-#endif\n+#endif\t/* HAVE_LIBIDN */\n \t {\n #ifdef HAVE_LIBIDN\n \t make_copy:\n-#endif\n+#endif\t/* HAVE_LIBIDN */\n \t\tif (canonbuf != NULL)\n \t\t /* We already allocated the string using malloc, but\n \t\t the buffer is now owned by canon. */\n@@ -1193,9 +1193,9 @@ struct sort_result_combo\n \n #if __BYTE_ORDER == __BIG_ENDIAN\n # define htonl_c(n) n\n-#else\n+#else /* __BYTE_ORDER == __BIG_ENDIAN */\n # define htonl_c(n) __bswap_constant_32 (n)\n-#endif\n+#endif\t/* __BYTE_ORDER == __BIG_ENDIAN */\n \n static const struct scopeentry\n {\n@@ -1297,7 +1297,7 @@ static const struct prefixentry default_labels[] =\n }, 96, 4 },\n /* The next two entries differ from RFC 3484. We need to treat\n IPv6 site-local addresses special because they are never NATed,\n- unlike site-locale IPv4 addresses. If this would not happen, on\n+ unlike site-local IPv4 addresses. If this would not happen, on\n machines which have only IPv4 and IPv6 site-local addresses, the\n sorting would prefer the IPv6 site-local addresses, causing\n unnecessary delays when trying to connect to a global IPv6 address\n@@ -1715,7 +1715,7 @@ check_gaiconf_mtime (const struct stat64 *st)\n && st->st_mtim.tv_nsec == gaiconf_mtime.tv_nsec);\n }\n \n-#else\n+#else /* _STATBUF_ST_NSEC */\n \n static time_t gaiconf_mtime;\n \n@@ -1731,7 +1731,7 @@ check_gaiconf_mtime (const struct stat64 *st)\n return st->st_mtime == gaiconf_mtime;\n }\n \n-#endif\n+#endif\t/* _STATBUF_ST_NSEC */\n \n \n libc_freeres_fn(fini)\n@@ -2228,7 +2228,7 @@ getaddrinfo (const char *name, const char *service,\n #ifdef HAVE_LIBIDN\n \t |AI_IDN|AI_CANONIDN|AI_IDN_ALLOW_UNASSIGNED\n \t |AI_IDN_USE_STD3_ASCII_RULES\n-#endif\n+#endif\t/* HAVE_LIBIDN */\n \t |AI_NUMERICSERV|AI_ALL))\n return EAI_BADFLAGS;\n \n","prefixes":["RFC","1/4","BZ","17083"]}