Move savestring to common/common-utils.c, make gdbserver use it.
This makes gdbserver share gdb's savestring, instead of baking its own. Tested on x86_64 Fedora 17. gdb/ 2013-02-14 Pedro Alves <palves@redhat.com> * utils.c (savestring): Don't #undef it. Move function to common/common-utils.c. * common/common-utils.c: Include gdb_string.h. (savestring): Move here from utils.c. * common/common-utils.h (savestring): Declare. gdb/gdbserver/ 2013-02-14 Pedro Alves <palves@redhat.com> * tracepoint.c (save_string): Delete. (add_tracepoint_action): Use savestring instead of save_string.
This commit is contained in:
parent
57c3b6ede5
commit
baea0daecf
6 changed files with 32 additions and 31 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2013-02-14 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
|
* utils.c (savestring): Don't #undef it. Move function to
|
||||||
|
common/common-utils.c.
|
||||||
|
* common/common-utils.c: Include gdb_string.h.
|
||||||
|
(savestring): Move here from utils.c.
|
||||||
|
* common/common-utils.h (savestring): Declare.
|
||||||
|
|
||||||
2013-02-14 Pedro Alves <palves@redhat.com>
|
2013-02-14 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
* utils.c (savestring): Rename parameter 'size' to 'len'.
|
* utils.c (savestring): Rename parameter 'size' to 'len'.
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "gdb_assert.h"
|
#include "gdb_assert.h"
|
||||||
|
#include "gdb_string.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -150,3 +151,13 @@ xsnprintf (char *str, size_t size, const char *format, ...)
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *
|
||||||
|
savestring (const char *ptr, size_t len)
|
||||||
|
{
|
||||||
|
char *p = (char *) xmalloc (len + 1);
|
||||||
|
|
||||||
|
memcpy (p, ptr, len);
|
||||||
|
p[len] = 0;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
|
@ -47,4 +47,10 @@ char *xstrvprintf (const char *format, va_list ap)
|
||||||
int xsnprintf (char *str, size_t size, const char *format, ...)
|
int xsnprintf (char *str, size_t size, const char *format, ...)
|
||||||
ATTRIBUTE_PRINTF (3, 4);
|
ATTRIBUTE_PRINTF (3, 4);
|
||||||
|
|
||||||
|
/* Make a copy of the string at PTR with LEN characters
|
||||||
|
(and add a null character at the end in the copy).
|
||||||
|
Uses malloc to get the space. Returns the address of the copy. */
|
||||||
|
|
||||||
|
char *savestring (const char *ptr, size_t len);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2013-02-14 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
|
* tracepoint.c (save_string): Delete.
|
||||||
|
(add_tracepoint_action): Use savestring instead of save_string.
|
||||||
|
|
||||||
2013-02-12 Pedro Alves <palves@redhat.com>
|
2013-02-12 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
* linux-xtensa-low.c: Ditto.
|
* linux-xtensa-low.c: Ditto.
|
||||||
|
|
|
@ -1896,18 +1896,6 @@ find_next_tracepoint_by_number (struct tracepoint *prev_tp, int num)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static char *
|
|
||||||
save_string (const char *str, size_t len)
|
|
||||||
{
|
|
||||||
char *s;
|
|
||||||
|
|
||||||
s = xmalloc (len + 1);
|
|
||||||
memcpy (s, str, len);
|
|
||||||
s[len] = '\0';
|
|
||||||
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Append another action to perform when the tracepoint triggers. */
|
/* Append another action to perform when the tracepoint triggers. */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2028,7 +2016,7 @@ add_tracepoint_action (struct tracepoint *tpoint, char *packet)
|
||||||
* tpoint->num_step_actions));
|
* tpoint->num_step_actions));
|
||||||
tpoint->step_actions[tpoint->num_step_actions - 1] = action;
|
tpoint->step_actions[tpoint->num_step_actions - 1] = action;
|
||||||
tpoint->step_actions_str[tpoint->num_step_actions - 1]
|
tpoint->step_actions_str[tpoint->num_step_actions - 1]
|
||||||
= save_string (act_start, act - act_start);
|
= savestring (act_start, act - act_start);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -2041,7 +2029,7 @@ add_tracepoint_action (struct tracepoint *tpoint, char *packet)
|
||||||
sizeof (*tpoint->actions_str) * tpoint->numactions);
|
sizeof (*tpoint->actions_str) * tpoint->numactions);
|
||||||
tpoint->actions[tpoint->numactions - 1] = action;
|
tpoint->actions[tpoint->numactions - 1] = action;
|
||||||
tpoint->actions_str[tpoint->numactions - 1]
|
tpoint->actions_str[tpoint->numactions - 1]
|
||||||
= save_string (act_start, act - act_start);
|
= savestring (act_start, act - act_start);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
17
gdb/utils.c
17
gdb/utils.c
|
@ -89,9 +89,6 @@ extern PTR realloc (); /* ARI: PTR */
|
||||||
extern void free ();
|
extern void free ();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* readline defines this. */
|
|
||||||
#undef savestring
|
|
||||||
|
|
||||||
void (*deprecated_error_begin_hook) (void);
|
void (*deprecated_error_begin_hook) (void);
|
||||||
|
|
||||||
/* Prototypes for local functions */
|
/* Prototypes for local functions */
|
||||||
|
@ -1186,20 +1183,6 @@ myread (int desc, char *addr, int len)
|
||||||
return orglen;
|
return orglen;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make a copy of the string at PTR with LEN characters
|
|
||||||
(and add a null character at the end in the copy).
|
|
||||||
Uses malloc to get the space. Returns the address of the copy. */
|
|
||||||
|
|
||||||
char *
|
|
||||||
savestring (const char *ptr, size_t len)
|
|
||||||
{
|
|
||||||
char *p = (char *) xmalloc (len + 1);
|
|
||||||
|
|
||||||
memcpy (p, ptr, len);
|
|
||||||
p[len] = 0;
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
print_spaces (int n, struct ui_file *file)
|
print_spaces (int n, struct ui_file *file)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue