From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 4 Feb 2019 14:48:43 +0000 (+0000)
Subject: Remove duplicate initialization of field in nscd.
X-Git-Tag: glibc-2.30~389
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a0dcfc6439cd4e19bf393c2e2347e385361a82c;p=thirdparty%2Fglibc.git

Remove duplicate initialization of field in nscd.

I'm looking at the warnings from building glibc with -Wextra, to see
if we could use -Wextra by default, possibly with a few of its
warnings disabled, and so benefit from warnings in -Wextra but not in
-Wall.  (The vast bulk of the extra warnings so produced are from
-Wunused-parameter -Wsign-compare -Wmissing-field-initializers
-Wtype-limits, so I expect those would be disabled at least at first.)

Various miscellaneous warnings show up with -Wextra that it clearly
seems to make sense to fix independent of whether we add -Wextra to
the normal options for building glibc.  This patch fixes one:
"initialized field overwritten [-Woverride-init]" in nscd.

Tested for x86_64.

	* nscd/connections.c (reqinfo): Initialize SHUTDOWN element only
	once.
---

diff --git a/ChangeLog b/ChangeLog
index ef9688627df..d73c815c373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* nscd/connections.c (reqinfo): Initialize SHUTDOWN element only
+	once.
+
 2019-02-04  Andreas Schwab  <schwab@suse.de>
 
 	[BZ #16976]
diff --git a/nscd/connections.c b/nscd/connections.c
index 61cf27e24c2..a9bc00de905 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -227,7 +227,6 @@ static struct
   [GETHOSTBYADDRv6] = { true, &dbs[hstdb] },
   [SHUTDOWN] = { false, NULL },
   [GETSTAT] = { false, NULL },
-  [SHUTDOWN] = { false, NULL },
   [GETFDPW] = { false, &dbs[pwddb] },
   [GETFDGR] = { false, &dbs[grpdb] },
   [GETFDHST] = { false, &dbs[hstdb] },