From patchwork Wed Jan 20 22:12:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Metcalf X-Patchwork-Id: 10491 Received: (qmail 45080 invoked by alias); 20 Jan 2016 22:13:05 -0000 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: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 44958 invoked by uid 89); 20 Jan 2016 22:13:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=Silence, Hx-spam-relays-external:sk:DB5PR02, H*RU:sk:DB5PR02, HX-HELO:sk:emea01- X-HELO: emea01-db3-obe.outbound.protection.outlook.com Authentication-Results: spf=fail (sender IP is 12.216.194.146) smtp.mailfrom=ezchip.com; ezchip.com; dkim=none (message not signed) header.d=none; ezchip.com; dmarc=none action=none header.from=ezchip.com; Received-SPF: Fail (protection.outlook.com: domain of ezchip.com does not designate 12.216.194.146 as permitted sender) receiver=protection.outlook.com; client-ip=12.216.194.146; helo=ld-1.internal.tilera.com; From: Chris Metcalf To: , Adhemerval Zanella CC: Chris Metcalf Subject: [PATCH] Silence some false positive warnings for gcc 4.7 Date: Wed, 20 Jan 2016 17:12:50 -0500 Message-ID: <1453327970-4275-1-git-send-email-cmetcalf@ezchip.com> In-Reply-To: <569FD245.3080107@linaro.org> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD041; 1:OOW0Qshupz9oEZ6EHd9uGUc8+veTYVv+RTDh/kDStPVEYk/vu+OJicbu+dlWXudlZDGiAAyfx7Bn9pTKvcneryMaYIC0S/17WTFyE7qGBuUpUG7vZMGq4d/m/kLeFibTJOJ5i/zLOnvnk9JClxlDZtJPaC9FyAkNQqp4Q2NqC5FwDCrAsrJ/sVMbh7q4ORYNajIhXJrfZ2BHnmfK6IYE3ai7smwhtt8nit6yMceC3Obag4a2yOGiY3+a3DmjaL/WyxlTEC7d89xI4rnQbT2d8ngd852IlLZkmFYGGVKea60uwCZENmTnj+HIIQR2IblgFERo2ZLnl+t+4SbRXySIQtdyMcN9kbAPNscE1feNtGclOqbQdaxLtZvSBwBtnImrKs6DmUgRwNUo2UJ2Bd6VaKLuU52U67vrXs8wsde2mt+FdwcUT0rI2PbXwP8cChSS X-Forefront-Antispam-Report: CIP:12.216.194.146; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(377424004)(189002)(11100500001)(2950100001)(1096002)(4326007)(104016004)(1220700001)(229853001)(5008740100001)(87936001)(85426001)(50226001)(586003)(86362001)(47776003)(48376002)(2906002)(92566002)(4001430100002)(6806005)(19580405001)(107886002)(33646002)(50986999)(50466002)(5001770100001)(42186005)(19580395003)(5003940100001)(106466001)(5001970100001)(36756003)(105606002)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR02MB116; H:ld-1.internal.tilera.com; FPR:; SPF:Fail; PTR:wb-fw1.tilera.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB116; 2:x/6EH89f3lr57Tfhut3TsnUs4vESAPA2EUf72IzNaN+0Ri6hCxvAbL/kBEL1DURdYaG8MZBj+cTtjbOIqdw+JmVdmWQ+714uJQ4ysm/dMG74ER6cSTPzT63qp91QaNLmzdEBjDZKV3yI4QfG6LObiA==; 3:SqXjtvg8Sx5G5vTegENTEDj49EL9gDtwhuGz5TAXDmaoHXlF2Sdwf9jqmbqLE47MSCc7J6QI/nkDMm/4a/MLmP32eaoNl7D++6IRm3lxoxCPk1MQT2A8haMombGlis7WJ76mwq4bdPbVs+xv85xqSreJBTuiiiZ4E61kCQ8zloJ8xm/o9xjgzJc6MRF5uoux+7VNqIvbkt4jDUQsgSn44arrr67Trjqrumn2s4gyb6w=; 25:X8F3dcbO9AydTJ/FXi7KkHdvCi1R8PVYowOrFO6r2XP47kNMsfN0qat+iVJyq4UvVNxb1E8DRI913DZ8H+pfwku/0uGBq3Q6UWraetVJ9KvvkC5amDRU73ODqfVtSP5FkPjpmdf2fBDD0efw+pUDLlPClWKFm971MhfQbyoxu39EKqAvEN3zUgve+0aamr9+Gbul6Dg31HvwLLKpUmzikoyPrn61iOOyOnnhP8rVV8nvL/dWMjW9+U6sWtvpnIyI; 20:jOXIl+Gl6+fAsu8XOmo2Val+wskZ7iYXv/Oz+4UYEFYQLnt+sJMSEiOGFBjt+3VlxO+nTAmbd5Yfw01vpRTSIXlUI4TNiLWXjqBJvzehkDoBBN8HUV29zORah4O7TtSvS5bowhSKROrggTCT5Qv79im5Ni8k90MzM6DqUCevJe0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB116; X-MS-Office365-Filtering-Correlation-Id: 80ff40f8-a66f-4373-0c72-08d321e6d9c5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(121898900299872); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(13017025)(13018025)(13015025)(520078)(13023025)(13024025)(10201501046)(3002001); SRVR:AM3PR02MB116; BCL:0; PCL:0; RULEID:; SRVR:AM3PR02MB116; X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB116; 4:EXlkHiMwxAzLcMaQLL4KmHlr3rP2stuNH5zTFHK7WEi/s45/qYqR29TC+8zQqdVJwIn7v8Aak/78DZoveKjXsmcsycXnWX0V60MeoLCOVFmIz8yQs7yyk0Ev8MlYDpHc+nQKyeSKH4pnZmyMcqnAkhqc2vp9Jz/7rE8FIRCgsyZVxgQpXuDNNJC74o+K0CvhO8QAvG9uk5FzLMtTg6Kl6rK6Zj1/FEXMUaH8Ud2Q2eBiHX1Lwf8v+kd2fRKi3Mx901deuqzJqI9NF7FJBeGWPdqVPh8kmQBFW7mXcsFmmY05U2vV7s1abL4ugK0n9Gs9FEvm62ib95mHJfnxgRbb9wlJ+6g5waygx4V6WxQcy364unFKHSoN2vfY/69G+vLYGQrZHfpV2PjQhE7nQjKjAe6+E9BtvAjnGlflenPkw08EsdJfvApp+xQ49vCax4KIB3y+tXaGPgn62ogZg2zR4fIpoBUgbAIamdksHs2UkB1UZjiR1Des/Oc236lSI+6F7vLzgixUEYvXH2JLP6OJ0w== X-Forefront-PRVS: 0827D7ACB9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR02MB116; 23:y0FBkE8OBln09eGb8Kgij8AGP7GnIs+pZ1pUrafuZj?= =?us-ascii?Q?PWTQ/6t1GbY24hkB/co+xyI+7g/3AOZquvlhr19PmW+J3RfS14YOjb3BcY4g?= =?us-ascii?Q?dFlB+HeC1QMZp0aH1XsTnDPMgO3sMLoAHnAkf3TFj//ioQDyepncOpWFrzAd?= =?us-ascii?Q?UWSm0VRfaDjX+MR/7FbVEwbYyFVSB0cLFLkarBVaYWTy+ENCRT5+TGyhvhRm?= =?us-ascii?Q?obEJqUlqDsDrmmjcRbrkuI+NrqOBkY/3yrn+ls+RVvLiO/yR6+ysaaTNDrFh?= =?us-ascii?Q?YxtxUl5nKg0bQd7yes3I2IDGRaHCR5Nb9u+3dF0hyxVjQO6JcwGyPjPNkrof?= =?us-ascii?Q?YOgnE60ifKECwP6gdCX1eKrBg07DSiLw5TNQG7xCxp8qsRhFkTus6VocgBkz?= =?us-ascii?Q?41vvN9jj8LIVo6tVcO3nHYnZn/yxo+v1uINqTqMNfWszVQAIdpHuf7F61NO1?= =?us-ascii?Q?1FV0NeL9NgrUhAOJHe4HtaBe5dCxPExyX36+0IF2Ld+VvAKJkWLSlTGHF/Z3?= =?us-ascii?Q?zTr42JHwUkjvLAP2+HeyRbcUFhh/v29HcH0blf1Q2x92ejsfZBWPD6DocPhZ?= =?us-ascii?Q?kl/4vK8CtoIgRtwHw3ipb8E0CNy2jaKGQCeG9LM/fp/UoxI6f8d4tsYrXZ/e?= =?us-ascii?Q?K0Kakbv+HD94SKctIHlrkQF4VbDfRGHi+FyAue/NuBY/ip6WZ1e5VnZOO88d?= =?us-ascii?Q?f3DnaolqRJr7PRFOOKmf1SZeCNQWM8AXGwI0Ng4BO3ADlEUUj9sSpEe9pdzd?= =?us-ascii?Q?yuGVUN74F/PtKOn7mO6k3oRt/1O5HF+5sMMYXhte5tuNNRu7n5BBdJ8V/wNv?= =?us-ascii?Q?nJ1gUrYreE1LeE+3lVavPnuKp7DbPeEm/6OuyYbN/J6yPtlDGge73UnOAsCv?= =?us-ascii?Q?Kx1Y3on7GQ90kNSQhn1WP79bjhex5bRR2P6yDlrYHVbtpJgJs1XMpmB3SjsA?= =?us-ascii?Q?0deP0+I1b/2xp/uI/tuyOSi32wFb4fdJDPMdVeqgOEHhJffK0F5wjf97LIEP?= =?us-ascii?Q?he6cu0dGgvNndx7W80eC0c8zluZiOuf5MpJJ9SQ5/JawAex2kY7nQ4ppzUqn?= =?us-ascii?Q?awbqHGtlc+8/ACHXKMbDttrtGBYO+gLJRh1Fwn2IZ6ehdCQA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR02MB116; 5:uChQzIe7yi7RQis4YpTCgQGFSS1z20rAmefC+YRBciPwWHp4A+KXWiCtgGy2+YtDRXia9Bibbwou2SzM6QLbhhSRa/d1Qay1KqEDEIYm6dYnUMnXjvLHVHTuz4kafXPrzElJNMlXwYCYGs/BoaYZiQ==; 24:f/WIqbW6SY5r6nXpO6kLDW17RBAK5VM4zd1kkaBsE25TzSh5/f1ARijf7DD/msK4Bt5II3edEOFnQ02JE5wjjuA6kHp9frX2bY3xi257SiM= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2016 22:12:56.4768 (UTC) X-MS-Exchange-CrossTenant-Id: 0fc16e0a-3cd3-4092-8b2f-0a42cff122c3 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0fc16e0a-3cd3-4092-8b2f-0a42cff122c3; Ip=[12.216.194.146]; Helo=[ld-1.internal.tilera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR02MB116 Good to push to master? 2016-01-20 Chris Metcalf * nis/nis_table.c (__follow_path): Disable diagnostic for uninitialized variable that is a false positive for gcc 4.7. * stdio-common/vfscanf.c (_IO_vfwscanf): Likewise. diff --git a/nis/nis_table.c b/nis/nis_table.c index 2831164a191b..1d607a49c4e9 100644 --- a/nis/nis_table.c +++ b/nis/nis_table.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "nis_xdr.h" #include "nis_intern.h" @@ -175,6 +176,12 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq, *tableptr = *tablepath; } + + /* Since tableptr is only set here, and it's set when tablepath is NULL, + which it is initially defined as, we know it will always be set here. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized"); + if (*tableptr == NULL) return NIS_NOTFOUND; @@ -182,6 +189,8 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq, if (newname[0] == '\0') return NIS_NOTFOUND; + DIAG_POP_NEEDS_COMMENT; + newname = strdup (newname); if (newname == NULL) return NIS_NOMEMORY; diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index f8f97cd1d2cd..8cd59557a698 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -1535,6 +1536,13 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, { /* Get the string for the digits with value N. */ #ifdef COMPILE_WSCANF + + /* wcdigits_extended[] is fully set in the loop + above, but the test for "map != NULL" is done + inside the loop here and outside the loop there. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized"); + if (__glibc_unlikely (map != NULL)) wcdigits[n] = wcdigits_extended[n]; else @@ -1542,6 +1550,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, _NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n); wcdigits[n] += from_level; + DIAG_POP_NEEDS_COMMENT; + if (c == (wint_t) *wcdigits[n]) { to_level = from_level;