aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2017-10-14 08:41:01 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2017-10-14 08:41:01 -0400
commit8d3c73ef6b1aff1b22296bd48ec302b4b1d4808c (patch)
treea1348fe90cf0dc93752fd97a89404e91570b3c39
parentb129dcac882da87767cb863ad8b2572f90e9e5bc (diff)
downloadgdb-8d3c73ef6b1aff1b22296bd48ec302b4b1d4808c.zip
gdb-8d3c73ef6b1aff1b22296bd48ec302b4b1d4808c.tar.gz
gdb-8d3c73ef6b1aff1b22296bd48ec302b4b1d4808c.tar.bz2
Rename traceframe_info variable to current_traceframe_info
... so it doesn't shadow the traceframe_info type. It think it's a clearer name anyway. gdb/ChangeLog: * tracepoint.c (traceframe_info): Rename to... (current_traceframe_info): ...this. (clear_traceframe_info): Adjust. (get_traceframe_info): Adjust.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/tracepoint.c12
2 files changed, 13 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a42351f..773c828 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-14 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * tracepoint.c (traceframe_info): Rename to...
+ (current_traceframe_info): ...this.
+ (clear_traceframe_info): Adjust.
+ (get_traceframe_info): Adjust.
+
2017-10-14 Simon Marchi <simon.marchi@ericsson.com>
* nat/linux-osdata.c: Include algorithm.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index c66a4b3..bbfc2ce 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -133,7 +133,7 @@ static int tracepoint_number;
yet attempted to fetch it, or if the target does not support
fetching this object, or if we're not inspecting a traceframe
presently. */
-static struct traceframe_info *traceframe_info;
+static struct traceframe_info *current_traceframe_info;
/* Tracing command lists. */
static struct cmd_list_element *tfindlist;
@@ -211,8 +211,8 @@ free_traceframe_info (struct traceframe_info *info)
static void
clear_traceframe_info (void)
{
- free_traceframe_info (traceframe_info);
- traceframe_info = NULL;
+ free_traceframe_info (current_traceframe_info);
+ current_traceframe_info = NULL;
}
/* Set traceframe number to NUM. */
@@ -4101,10 +4101,10 @@ parse_traceframe_info (const char *tframe_info)
struct traceframe_info *
get_traceframe_info (void)
{
- if (traceframe_info == NULL)
- traceframe_info = target_traceframe_info ();
+ if (current_traceframe_info == NULL)
+ current_traceframe_info = target_traceframe_info ();
- return traceframe_info;
+ return current_traceframe_info;
}
/* If the target supports the query, return in RESULT the set of