pinentry-dmenu

Commit: daa292de8e139e7aaebcee3cc9d52f750ae3d95b
Parent: 75634f63d166b2916763249875310fc1269fe626
Author: Moritz Luedecke
Date:   Sun, 20 Aug 2017 15:24:16 +0200

Remove unused variable and fix a warning

Diffstat:
M
pinentry-dmenu.c
 | 
9
+++------

1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/pinentry-dmenu.c b/pinentry-dmenu.c
@@ -570,16 +570,13 @@ main(int argc, char *argv[]) {
 	const char *str;
 	char path[PATH_MAX];
 	struct passwd *pw = getpwuid(getuid());
+	config_t cfg;
 
+	config_init(&cfg);
 	i = strlen(pw->pw_dir);
 	strcpy(path, pw->pw_dir);
 	strcpy(&path[i], CONFIG);
 
-	config_t cfg;
-	config_setting_t *setting;
-
-	config_init(&cfg);
-
 	/* Read the file. If there is an error, report it and exit. */
 	if (config_read_file(&cfg, path)) {
 		if (config_lookup_string(&cfg, "asterisk", &str)) {
@@ -627,7 +624,7 @@ main(int argc, char *argv[]) {
 		if (config_lookup_bool(&cfg, "embedded", &bval)) {
 			embedded = bval;
 		}
-	} else if (str = config_error_file(&cfg)) {
+	} else if ((str = config_error_file(&cfg))) {
 		fprintf(stderr, "%s:%d: %s\n", config_error_file(&cfg),
 		        config_error_line(&cfg), config_error_text(&cfg));
 		return(EXIT_FAILURE);