89 lines
2.5 KiB
Diff
89 lines
2.5 KiB
Diff
|
From 5769d5d17cdb4770f1e08167b76c1684ad4e1f73 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yvan Roux <yvan.roux@linaro.org>
|
||
|
|
Date: Fri, 15 Apr 2016 13:29:26 +0200
|
||
|
|
Subject: [PATCH 1/1] Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses
|
||
|
|
|
||
|
|
(cherry picked from commit df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c)
|
||
|
|
|
||
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||
|
|
(downloaded from upstream git repo and removed changes to Changelog:
|
||
|
|
https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5769d5d17cdb4770f1e08167b76c1684ad4e1f73;hp=f1e182acaaa84e844eb96462a92ba532e1c1fff4)
|
||
|
|
---
|
||
|
|
ChangeLog | 5 +++++
|
||
|
|
nis/nis_call.c | 20 +++++++++++---------
|
||
|
|
stdlib/setenv.c | 26 ++++++++++++++------------
|
||
|
|
3 files changed, 30 insertions(+), 21 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/nis/nis_call.c b/nis/nis_call.c
|
||
|
|
index 3fa37e4..cb7839a 100644
|
||
|
|
--- a/nis/nis_call.c
|
||
|
|
+++ b/nis/nis_call.c
|
||
|
|
@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
|
||
|
|
/* Choose which entry should be evicted from the cache. */
|
||
|
|
loc = &nis_server_cache[0];
|
||
|
|
if (*loc != NULL)
|
||
|
|
- for (i = 1; i < 16; ++i)
|
||
|
|
- if (nis_server_cache[i] == NULL)
|
||
|
|
- {
|
||
|
|
+ {
|
||
|
|
+ for (i = 1; i < 16; ++i)
|
||
|
|
+ if (nis_server_cache[i] == NULL)
|
||
|
|
+ {
|
||
|
|
+ loc = &nis_server_cache[i];
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+ else if ((*loc)->uses > nis_server_cache[i]->uses
|
||
|
|
+ || ((*loc)->uses == nis_server_cache[i]->uses
|
||
|
|
+ && (*loc)->expires > nis_server_cache[i]->expires))
|
||
|
|
loc = &nis_server_cache[i];
|
||
|
|
- break;
|
||
|
|
- }
|
||
|
|
- else if ((*loc)->uses > nis_server_cache[i]->uses
|
||
|
|
- || ((*loc)->uses == nis_server_cache[i]->uses
|
||
|
|
- && (*loc)->expires > nis_server_cache[i]->expires))
|
||
|
|
- loc = &nis_server_cache[i];
|
||
|
|
+ }
|
||
|
|
old = *loc;
|
||
|
|
*loc = new;
|
||
|
|
|
||
|
|
diff --git a/stdlib/setenv.c b/stdlib/setenv.c
|
||
|
|
index da61ee0..e66045f 100644
|
||
|
|
--- a/stdlib/setenv.c
|
||
|
|
+++ b/stdlib/setenv.c
|
||
|
|
@@ -278,18 +278,20 @@ unsetenv (const char *name)
|
||
|
|
ep = __environ;
|
||
|
|
if (ep != NULL)
|
||
|
|
while (*ep != NULL)
|
||
|
|
- if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
|
||
|
|
- {
|
||
|
|
- /* Found it. Remove this pointer by moving later ones back. */
|
||
|
|
- char **dp = ep;
|
||
|
|
-
|
||
|
|
- do
|
||
|
|
- dp[0] = dp[1];
|
||
|
|
- while (*dp++);
|
||
|
|
- /* Continue the loop in case NAME appears again. */
|
||
|
|
- }
|
||
|
|
- else
|
||
|
|
- ++ep;
|
||
|
|
+ {
|
||
|
|
+ if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
|
||
|
|
+ {
|
||
|
|
+ /* Found it. Remove this pointer by moving later ones back. */
|
||
|
|
+ char **dp = ep;
|
||
|
|
+
|
||
|
|
+ do
|
||
|
|
+ dp[0] = dp[1];
|
||
|
|
+ while (*dp++);
|
||
|
|
+ /* Continue the loop in case NAME appears again. */
|
||
|
|
+ }
|
||
|
|
+ else
|
||
|
|
+ ++ep;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
UNLOCK;
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.1
|
||
|
|
|