From patchwork Sat Sep 23 04:28:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 23107 Received: (qmail 98250 invoked by alias); 23 Sep 2017 04:28:12 -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 98237 invoked by uid 89); 23 Sep 2017 04:28:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 23 Sep 2017 04:28:10 +0000 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy10.mail.unifiedlayer.com (Postfix) with ESMTP id E2960140548 for ; Fri, 22 Sep 2017 22:28:08 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id CsU51w00V2f2jeq01sU85H; Fri, 22 Sep 2017 22:28:08 -0600 X-Authority-Analysis: v=2.2 cv=K/VSJ2eI c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=20KFwNOVAAAA:8 a=zstS-IiYAAAA:8 a=OgTCWAMR7d54n-XbgdIA:9 a=SljMcbDTRvBvvQGz:21 a=MLh2o8mqeQExPpEp:21 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:39168 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dvc2v-002lXq-6c; Fri, 22 Sep 2017 22:28:05 -0600 From: Tom Tromey To: Pedro Alves Cc: "Metzger\, Markus T" , Tom Tromey , "gdb-patches\@sourceware.org" Subject: Re: [RFA 49/67] Constify some commands in btrace.c References: <20170921051023.19023-1-tom@tromey.com> <20170921051023.19023-50-tom@tromey.com> <74f1184e-0d97-1082-4a51-3ae99c55717a@redhat.com> <83de5929-b2f2-fbd5-effd-740c21cd2a98@redhat.com> Date: Fri, 22 Sep 2017 22:28:04 -0600 In-Reply-To: <83de5929-b2f2-fbd5-effd-740c21cd2a98@redhat.com> (Pedro Alves's message of "Thu, 21 Sep 2017 14:46:55 +0100") Message-ID: <87ingaght7.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 X-BWhitelist: no X-Exim-ID: 1dvc2v-002lXq-6c X-Source-Sender: 75-166-76-94.hlrn.qwest.net (bapiya) [75.166.76.94]:39168 X-Source-Auth: tom+tromey.com X-Email-Count: 16 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes >>>>> "Pedro" == Pedro Alves writes: Pedro> BTW, looking at the get_context_size function in question, it Pedro> seems like the 'number' variable is not used, meaning we could Pedro> apply something like this: Here's the updated version. Tom diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9889055..92370b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2017-09-20 Tom Tromey + * btrace.c (get_uint, get_context_size, no_chunk) + (maint_btrace_packet_history_cmd) + (maint_btrace_clear_packet_history_cmd, maint_btrace_clear_cmd) + (maint_info_btrace_cmd): Constify. + +2017-09-20 Tom Tromey + * reverse.c (delete_bookmark_command): Constify. 2017-09-20 Tom Tromey diff --git a/gdb/btrace.c b/gdb/btrace.c index 8527c6f..7990d5f 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -3180,9 +3180,10 @@ btrace_maint_print_packets (struct btrace_thread_info *btinfo, /* Read a number from an argument string. */ static unsigned int -get_uint (char **arg) +get_uint (const char **arg) { - char *begin, *end, *pos; + const char *begin, *pos; + char *end; unsigned long number; begin = *arg; @@ -3203,23 +3204,23 @@ get_uint (char **arg) /* Read a context size from an argument string. */ static int -get_context_size (char **arg) +get_context_size (const char **arg) { - char *pos; - int number; - - pos = skip_spaces (*arg); + const char *pos = skip_spaces (*arg); if (!isdigit (*pos)) error (_("Expected positive number, got: %s."), pos); - return strtol (pos, arg, 10); + char *end; + long result = strtol (pos, &end, 10); + *arg = end; + return result; } /* Complain about junk at the end of an argument string. */ static void -no_chunk (char *arg) +no_chunk (const char *arg) { if (*arg != 0) error (_("Junk after argument: %s."), arg); @@ -3228,7 +3229,7 @@ no_chunk (char *arg) /* The "maintenance btrace packet-history" command. */ static void -maint_btrace_packet_history_cmd (char *arg, int from_tty) +maint_btrace_packet_history_cmd (const char *arg, int from_tty) { struct btrace_thread_info *btinfo; struct thread_info *tp; @@ -3333,7 +3334,7 @@ maint_btrace_packet_history_cmd (char *arg, int from_tty) /* The "maintenance btrace clear-packet-history" command. */ static void -maint_btrace_clear_packet_history_cmd (char *args, int from_tty) +maint_btrace_clear_packet_history_cmd (const char *args, int from_tty) { struct btrace_thread_info *btinfo; struct thread_info *tp; @@ -3355,7 +3356,7 @@ maint_btrace_clear_packet_history_cmd (char *args, int from_tty) /* The "maintenance btrace clear" command. */ static void -maint_btrace_clear_cmd (char *args, int from_tty) +maint_btrace_clear_cmd (const char *args, int from_tty) { struct btrace_thread_info *btinfo; struct thread_info *tp; @@ -3418,7 +3419,7 @@ maint_btrace_pt_show_cmd (char *args, int from_tty) /* The "maintenance info btrace" command. */ static void -maint_info_btrace_cmd (char *args, int from_tty) +maint_info_btrace_cmd (const char *args, int from_tty) { struct btrace_thread_info *btinfo; struct thread_info *tp;