From patchwork Wed Nov 25 00:34:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 9813 Received: (qmail 85597 invoked by alias); 25 Nov 2015 00:34:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 85467 invoked by uid 89); 25 Nov 2015 00:34:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-wm0-f52.google.com Received: from mail-wm0-f52.google.com (HELO mail-wm0-f52.google.com) (74.125.82.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 25 Nov 2015 00:34:44 +0000 Received: by wmec201 with SMTP id c201so49435524wme.1 for ; Tue, 24 Nov 2015 16:34:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=PJxKsWon1So3wOnAPlXw8H+phPkDzvjfyn5kNku8qxA=; b=k2Xu3VpOPqKGz9yVtrX4bG25XZvmJOoFkgLWiOH6i9CANAcGytxfXtYvIgZRV6nDKR 71306R6FqZE6fInF41/ifiMuWJfdQIwmvmQ67MUhvAMkimo8Zn5UqCTrBo58cMZ5dPf4 3HZVj3VrTKxKfzrpkZVp/3eiOkWIJPvBSzr7L504ldvBmjR3d8QzS2+AJJN6rGwFLVXd vlGbI420xsfgoKAfJ6hPO7SrTFQ5IIUT/mc1WfHzzQOboSFYdXekqcRtrfM/QCOs7Sfh iqJOTpwyFdABNs8sKnARdLsICNy73cwoAToQYOYRdfljq9462TBZ3hs22piSNBslGIb3 OXSg== X-Gm-Message-State: ALoCoQmCLJbC3wkIipT/BHNSaTsJmRu6kfi9CE4/kMTl883vOKOGbJeyJjrXNFkGIv0BKEWPKNyr X-Received: by 10.194.115.129 with SMTP id jo1mr40541192wjb.28.1448411681230; Tue, 24 Nov 2015 16:34:41 -0800 (PST) Received: from localhost (host86-138-95-213.range86-138.btcentralplus.com. [86.138.95.213]) by smtp.gmail.com with ESMTPSA id c13sm905913wmd.14.2015.11.24.16.34.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Nov 2015 16:34:40 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 3/7] gdb: Small code restructure for list_command. Date: Wed, 25 Nov 2015 00:34:28 +0000 Message-Id: <1c3dd6d5b28b0bb19a0d0b94e83c9182306722ab.1448411121.git.andrew.burgess@embecosm.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes Move handling of special +/- arguments to the list_command function inside a single if block, this helps group all related functionality together. There should be no user visible changes after this commit. gdb/ChangeLog: * cli/cli-cmds.c (list_command): Move all handling of +/- arguments into a single if block. --- gdb/ChangeLog | 5 +++++ gdb/cli/cli-cmds.c | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9c22a9a..a19ed49 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2015-11-24 Andrew Burgess + * cli/cli-cmds.c (list_command): Move all handling of +/- + arguments into a single if block. + +2015-11-24 Andrew Burgess + * cli/cli-cmds.c (list_command): Use NULL instead of 0 when checking pointers. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 841fc55..c47526f 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -932,26 +932,26 @@ list_command (char *arg, int from_tty) first + get_lines_to_list (), 0); return; } - } - /* "l" or "l +" lists next ten lines. */ + /* "l" or "l +" lists next ten lines. */ - if (arg == NULL || strcmp (arg, "+") == 0) - { - print_source_lines (cursal.symtab, cursal.line, - cursal.line + get_lines_to_list (), 0); - return; - } + if (arg == NULL || strcmp (arg, "+") == 0) + { + print_source_lines (cursal.symtab, cursal.line, + cursal.line + get_lines_to_list (), 0); + return; + } - /* "l -" lists previous ten lines, the ones before the ten just - listed. */ - if (strcmp (arg, "-") == 0) - { - print_source_lines (cursal.symtab, - max (get_first_line_listed () - - get_lines_to_list (), 1), - get_first_line_listed (), 0); - return; + /* "l -" lists previous ten lines, the ones before the ten just + listed. */ + if (strcmp (arg, "-") == 0) + { + print_source_lines (cursal.symtab, + max (get_first_line_listed () + - get_lines_to_list (), 1), + get_first_line_listed (), 0); + return; + } } /* Now if there is only one argument, decode it in SAL