linux-kernel - [PATCH] xconfig: merge code path to conf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 24 May 2011 14:16:18 -0400
From:	Arnaud Lacombe <lacombar@...il.com>
To:	linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:	Hiromu Yakura <hiromu1996@...il.com>,
	Michal Marek <mmarek@...e.cz>,
	Arnaud Lacombe <lacombar@...il.com>
Subject: [PATCH] xconfig: merge code path to conf_write()

Michal, Hiromu,

That should fix the first error miss in xconfig. I'll have a look tonight to
gconf.

 - Arnaud

---

From: Arnaud Lacombe <lacombar@...il.com>
Subject: [PATCH] xconfig: merge code path to conf_write()

Avoid to have multiple path saving the config. This fixes an error check miss
when the window is being closed and the user requested the config to be written.

Reported-by: Hiromu Yakura <hiromu1996@...il.com>
Pointed-out-by: Michal Marek <mmarek@...e.cz>
Signed-off-by: Arnaud Lacombe <lacombar@...il.com>
---
 scripts/kconfig/qconf.cc |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 06dd2e3..c2796b8 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1489,8 +1489,7 @@ void ConfigMainWindow::saveConfigAs(void)
 	QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this);
 	if (s.isNull())
 		return;
-	if (conf_write(QFile::encodeName(s)))
-		QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
+	saveConfig();
 }
 
 void ConfigMainWindow::searchConfig(void)
@@ -1643,7 +1642,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
 	mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
 	switch (mb.exec()) {
 	case QMessageBox::Yes:
-		conf_write(NULL);
+		saveConfig();
 	case QMessageBox::No:
 		e->accept();
 		break;
-- 
1.7.3.4.574.g608b.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/