[src/trunk]: src/bin/ed PR/50879: David Binderman: remove redundant code.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74916bc8fcda
branches:  trunk
changeset: 343910:74916bc8fcda
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 02 19:11:28 2016 +0000

description:
PR/50879: David Binderman: remove redundant code.

diffstat:

 bin/ed/main.c |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 49685e1fa5c5 -r 74916bc8fcda bin/ed/main.c
--- a/bin/ed/main.c     Wed Mar 02 19:03:31 2016 +0000
+++ b/bin/ed/main.c     Wed Mar 02 19:11:28 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.27 2014/03/31 12:55:46 christos Exp $       */
+/*     $NetBSD: main.c,v 1.28 2016/03/02 19:11:28 christos Exp $       */
 
 /* main.c: This file contains the main control and user-interface routines
    for the ed line editor. */
@@ -39,7 +39,7 @@
 #if 0
 static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.27 2014/03/31 12:55:46 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.28 2016/03/02 19:11:28 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -223,11 +223,14 @@
                }
                isglobal = 0;
                if ((status = extract_addr_range()) >= 0 &&
-                   (status = exec_command()) >= 0)
-                       if (!status || (status &&
-                           (status = display_lines(current_addr, current_addr,
-                               status)) >= 0))
+                   (status = exec_command()) >= 0) {
+                       if (status == 0)
                                continue;
+                       status = display_lines(current_addr, current_addr,
+                           status);
+                       if (status >= 0)
+                               continue;
+               }
                switch (status) {
                case EOF:
                        quit(0);