From edbccda8f2ea7b1b6772f4e0d8a094341caef15d Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 25 Sep 2020 11:17:52 +0000
Subject: Remove some dangling elses for consistency with the rest of the file

---
 src/lib/libcrypto/ui/ui_lib.c | 44 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index 0a22eba69f..5f893c5915 100644
--- a/src/lib/libcrypto/ui/ui_lib.c
+++ b/src/lib/libcrypto/ui/ui_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_lib.c,v 1.42 2020/09/25 11:05:21 tb Exp $ */
+/* $OpenBSD: ui_lib.c,v 1.43 2020/09/25 11:17:52 tb Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -562,8 +562,8 @@ UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui))
 	if (method) {
 		method->ui_open_session = opener;
 		return 0;
-	} else
-		return -1;
+	}
+	return -1;
 }
 
 int
@@ -572,8 +572,8 @@ UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis))
 	if (method) {
 		method->ui_write_string = writer;
 		return 0;
-	} else
-		return -1;
+	}
+	return -1;
 }
 
 int
@@ -582,8 +582,8 @@ UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui))
 	if (method) {
 		method->ui_flush = flusher;
 		return 0;
-	} else
-		return -1;
+	}
+	return -1;
 }
 
 int
@@ -592,8 +592,8 @@ UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis))
 	if (method) {
 		method->ui_read_string = reader;
 		return 0;
-	} else
-		return -1;
+	}
+	return -1;
 }
 
 int
@@ -602,8 +602,8 @@ UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui))
 	if (method) {
 		method->ui_close_session = closer;
 		return 0;
-	} else
-		return -1;
+	}
+	return -1;
 }
 
 int
@@ -614,8 +614,8 @@ UI_method_set_prompt_constructor(UI_METHOD *method,
 	if (method) {
 		method->ui_construct_prompt = prompt_constructor;
 		return 0;
-	} else
-		return -1;
+	}
+	return -1;
 }
 
 int
@@ -623,8 +623,7 @@ int
 {
 	if (method)
 		return method->ui_open_session;
-	else
-		return NULL;
+	return NULL;
 }
 
 int
@@ -632,8 +631,7 @@ int
 {
 	if (method)
 		return method->ui_write_string;
-	else
-		return NULL;
+	return NULL;
 }
 
 int
@@ -641,8 +639,7 @@ int
 {
 	if (method)
 		return method->ui_flush;
-	else
-		return NULL;
+	return NULL;
 }
 
 int
@@ -650,8 +647,7 @@ int
 {
 	if (method)
 		return method->ui_read_string;
-	else
-		return NULL;
+	return NULL;
 }
 
 int
@@ -659,8 +655,7 @@ int
 {
 	if (method)
 		return method->ui_close_session;
-	else
-		return NULL;
+	return NULL;
 }
 
 char *
@@ -669,8 +664,7 @@ char *
 {
 	if (method)
 		return method->ui_construct_prompt;
-	else
-		return NULL;
+	return NULL;
 }
 
 enum UI_string_types
-- 
cgit v1.2.3-55-g6feb