darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move some statics from remote_read_qxfer into struct remote_state

Browse source 
This moves a few static variables out of remote_read_qxfer and into
remote_state.

	* remote.c (struct remote_state) <finished_object,
	finished_annex, finished_offset>: New fields.
	(remote_read_qxfer): Use remote_state fields; remove static
	variables.
This commit is contained in:
Tom Tromey 2013-08-14 18:08:48 +00:00
parent 280ceea309
commit 8e88304f57
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

@ -1,3 +1,10 @@
2013-08-14 Tom Tromey <tromey@redhat.com>
* remote.c (struct remote_state) <finished_object,
finished_annex, finished_offset>: New fields.
(remote_read_qxfer): Use remote_state fields; remove static
variables.
2013-08-14 Tom Tromey <tromey@redhat.com>
* remote.c (struct remote_state) <last_sent_step>:

30
gdb/remote.c
View file

@ -387,6 +387,10 @@ struct remote_state
enum gdb_signal last_sent_signal;
int last_sent_step;
char *finished_object;
char *finished_annex;
ULONGEST finished_offset;
};
/* Private data that we'll store in (struct thread_info)->private. */
@ -8701,10 +8705,6 @@ remote_read_qxfer (struct target_ops *ops, const char *object_name,
gdb_byte *readbuf, ULONGEST offset, LONGEST len,
struct packet_config *packet)
{
static char *finished_object;
static char *finished_annex;
static ULONGEST finished_offset;
struct remote_state *rs = get_remote_state ();
LONGEST i, n, packet_len;
@ -8713,19 +8713,19 @@ remote_read_qxfer (struct target_ops *ops, const char *object_name,
/* Check whether we've cached an end-of-object packet that matches
this request. */
if (finished_object)
if (rs->finished_object)
{
if (strcmp (object_name, finished_object) == 0
&& strcmp (annex ? annex : "", finished_annex) == 0
&& offset == finished_offset)
if (strcmp (object_name, rs->finished_object) == 0
&& strcmp (annex ? annex : "", rs->finished_annex) == 0
&& offset == rs->finished_offset)
return 0;
/* Otherwise, we're now reading something different. Discard
the cache. */
xfree (finished_object);
xfree (finished_annex);
finished_object = NULL;
finished_annex = NULL;
xfree (rs->finished_object);
xfree (rs->finished_annex);
rs->finished_object = NULL;
rs->finished_annex = NULL;
}
/* Request only enough to fit in a single packet. The actual data
@ -8764,9 +8764,9 @@ remote_read_qxfer (struct target_ops *ops, const char *object_name,
object, record this fact to bypass a subsequent partial read. */
if (rs->buf[0] == 'l' && offset + i > 0)
{
finished_object = xstrdup (object_name);
finished_annex = xstrdup (annex ? annex : "");
finished_offset = offset + i;
rs->finished_object = xstrdup (object_name);
rs->finished_annex = xstrdup (annex ? annex : "");
rs->finished_offset = offset + i;
}
return i;