From b8b196d3e21c8f979b1976014b6ff1169acbdb82 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 30 Aug 2005 11:41:45 +0000
Subject: [PATCH] r9790: remove 'set but not used' variables (reported by Jason
 Mader)

---
 source/nmbd/nmbd.c | 3 +--
 source/web/swat.c  | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 97e22943b14..bc58dd3a281 100644
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -650,7 +650,6 @@ static BOOL open_sockets(BOOL isdaemon, int port)
 	pstring logfile;
 	static BOOL opt_interactive;
 	poptContext pc;
-	int opt;
 	struct poptOption long_options[] = {
 	POPT_AUTOHELP
 	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon(default)" },
@@ -666,7 +665,7 @@ static BOOL open_sockets(BOOL isdaemon, int port)
 	global_nmb_port = NMB_PORT;
 
 	pc = poptGetContext("nmbd", argc, argv, long_options, 0);
-	while ((opt = poptGetNextOpt(pc)) != -1) ;
+	while (poptGetNextOpt(pc) != -1) {};
 	poptFreeContext(pc);
 
 	global_in_nmbd = True;
diff --git a/source/web/swat.c b/source/web/swat.c
index 3e11b15f748..4082574e442 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -1386,13 +1386,12 @@ static void printers_page(void)
  **/
  int main(int argc, char *argv[])
 {
-	int opt;
 	const char *page;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
-        { "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
+        	{ "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
@@ -1423,7 +1422,7 @@ static void printers_page(void)
 
 	/* Parse command line options */
 
-	while((opt = poptGetNextOpt(pc)) != -1) { }
+	while(poptGetNextOpt(pc) != -1) { }
 
 	poptFreeContext(pc);
 
-- 
2.11.4.GIT