Max Kellermann <max@duempel.org>:

eliminate local variable by returning from the loop

2 files changed, 6 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ba7041..01dcc05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@ o use C99 integers (uint32_t instead of u_int32_t)
 
 = conntrack =
 o check for malloc() failure in merge_opts
+o eliminate local variable by returning from the loop
 
 = conntrackd =
 o resolve global variable "alarm" conflict with alarm() function in unistd.h.
diff --git a/src/conntrack.c b/src/conntrack.c
index f170bed..4d0642c 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -156,19 +156,17 @@ void register_proto(struct ctproto_handler *h)
 
 static struct ctproto_handler *findproto(char *name)
 {
-	struct ctproto_handler *cur, *handler = NULL;
+	struct ctproto_handler *cur;
 
 	if (!name) 
-		return handler;
+		return NULL;
 
 	list_for_each_entry(cur, &proto_list, head) {
-		if (strcmp(cur->name, name) == 0) {
-			handler = cur;
-			break;
-		}
+		if (strcmp(cur->name, name) == 0)
+			return cur;
 	}
 
-	return handler;
+	return NULL;
 }
 
 static void