Patchwork [FYI] Make remote.c ptid constants "const"

login
register
mail settings
Submitter Tom Tromey
Date March 12, 2019, 5:04 p.m.
Message ID <20190312170414.31343-1-tromey@adacore.com>
Download mbox | patch
Permalink /patch/31827/
State New
Headers show

Comments

Tom Tromey - March 12, 2019, 5:04 p.m.
This changes magic_null_ptid, not_sent_ptid, and any_thread_ptid to be
"const".  This is a minor improvement that makes it so these can't be
accidentally modified.

Tested by rebuilding.  I'm checking this in.

gdb/ChangeLog
2019-03-12  Tom Tromey  <tromey@adacore.com>

	* remote.c (magic_null_ptid, not_sent_ptid, any_thread_ptid): Now
	const.  Add initializers.
	(_initialize_remote): Don't initialize ptid globals.
---
 gdb/ChangeLog |  6 ++++++
 gdb/remote.c  | 14 +++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

Patch

diff --git a/gdb/remote.c b/gdb/remote.c
index ef12fe9a3b4..d113f99e48c 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2297,9 +2297,11 @@  remote_target::remove_exec_catchpoint (int pid)
 
 
 
-static ptid_t magic_null_ptid;
-static ptid_t not_sent_ptid;
-static ptid_t any_thread_ptid;
+/* Take advantage of the fact that the TID field is not used, to tag
+   special ptids with it set to != 0.  */
+static const ptid_t magic_null_ptid (42000, -1, 1);
+static const ptid_t not_sent_ptid (42000, -2, 1);
+static const ptid_t any_thread_ptid (42000, 0, 1);
 
 /* Find out if the stub attached to PID (and hence GDB should offer to
    detach instead of killing it when bailing out).  */
@@ -14754,10 +14756,4 @@  stepping is supported by the target.  The default is on."),
 
   /* Eventually initialize fileio.  See fileio.c */
   initialize_remote_fileio (remote_set_cmdlist, remote_show_cmdlist);
-
-  /* Take advantage of the fact that the TID field is not used, to tag
-     special ptids with it set to != 0.  */
-  magic_null_ptid = ptid_t (42000, -1, 1);
-  not_sent_ptid = ptid_t (42000, -2, 1);
-  any_thread_ptid = ptid_t (42000, 0, 1);
 }