From 58fe73cb9381892384051ab00fa7969ef36e4477 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Mar 22 2011 15:01:58 +0000
Subject: - remove unused variables


---

diff --git a/src/certext.c b/src/certext.c
index ecdc253..b92bf8d 100644
--- a/src/certext.c
+++ b/src/certext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009,2011 Red Hat, Inc.
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1142,7 +1142,6 @@ cm_certext_read_extensions(struct cm_store_entry *entry, PLArenaPool *arena,
 			   CERTCertExtension **extensions)
 {
 	int i;
-	char *ku, *eku, *principal, *hostname, *email;
 	PLArenaPool *local_arena;
 
 	SECOidData *ku_oid, *eku_oid, *san_oid;
@@ -1157,11 +1156,6 @@ cm_certext_read_extensions(struct cm_store_entry *entry, PLArenaPool *arena,
 		local_arena = NULL;
 	}
 
-	ku = NULL;
-	eku = NULL;
-	principal = NULL;
-	hostname = NULL;
-	email = NULL;
 	ku_oid = SECOID_FindOIDByTag(SEC_OID_X509_KEY_USAGE);
 	if (ku_oid == NULL) {
 		cm_log(1, "Internal library error: unable to look up OID for "
diff --git a/src/certmaster.c b/src/certmaster.c
index 1f6a0cb..e1f1086 100644
--- a/src/certmaster.c
+++ b/src/certmaster.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009,2010 Red Hat, Inc.
+ * Copyright (C) 2009,2010,2011 Red Hat, Inc.
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 int
 main(int argc, char **argv)
 {
-	int i, c, ret;
+	int i, c;
 	const char *host = NULL, *port = NULL, *cainfo = NULL, *capath = NULL;
 	char *csr, *p, uri[LINE_MAX], *s1, *s2, *config;
 	struct cm_submit_x_context *ctx;
@@ -82,7 +82,6 @@ main(int argc, char **argv)
 			break;
 		}
 	}
-	ret = CM_STATUS_UNREACHABLE;
 
 	if (host == NULL) {
 		/* Okay, we have to figure out what the master name is. */
diff --git a/src/ipa.c b/src/ipa.c
index 81279dc..c3e6c3d 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009,2010 Red Hat, Inc.
+ * Copyright (C) 2009,2010,2011 Red Hat, Inc.
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
 int
 main(int argc, char **argv)
 {
-	int i, c, ret, host_is_uri = 0;
+	int i, c, host_is_uri = 0;
 	const char *host = NULL, *cainfo = NULL, *capath = NULL;
 	const char *ktname = NULL, *kpname = NULL, *args[2];
 	char *csr, *p, *q, uri[LINE_MAX], *s, *reqprinc = NULL, *ipaconfig;
@@ -145,7 +145,6 @@ main(int argc, char **argv)
 			argv[0]);
 		return CM_STATUS_UNCONFIGURED;
 	}
-	ret = CM_STATUS_UNREACHABLE;
 
 	/* Read the CSR from the environment, or from the command-line. */
 	csr = getenv(CM_SUBMIT_CSR_ENV);
diff --git a/src/subproc.c b/src/subproc.c
index 1824ecf..053f2d7 100644
--- a/src/subproc.c
+++ b/src/subproc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009,2011 Red Hat, Inc.
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -182,14 +182,13 @@ cm_subproc_parse_args(void *parent, const char *cmdline, const char **error)
 	const char *p;
 	char *q, *bigbuf;
 	char **argv;
-	int sqlevel, dqlevel, escape, word;
+	int sqlevel, dqlevel, escape;
 	size_t buffersize, words;
 
 	buffersize = strlen(cmdline) * 3;
 	bigbuf = talloc_zero_size(parent, buffersize);
 
 	sqlevel = dqlevel = escape = 0;
-	word = 0;
 	p = cmdline;
 	q = bigbuf;
 	while (*p != '\0') {