Unverified Commit a405c228 authored by Manish Goregaokar's avatar Manish Goregaokar
Browse files

Use strtok_r instead of strsep in rust_get_disr_info

strsep doesn't exist on Windows.

2016-06-29  Manish Goregaokar  <manish@mozilla.com>

gdb/ChangeLog:
    * rust-lang.c (rust_get_disr_info): Use strtok_r instead of strsep.
parent d691934d
2016-06-29 Manish Goregaokar <manish@mozilla.com>
gdb/ChangeLog:
* rust-lang.c (rust_get_disr_info): Use strtok_r instead of strsep.
2016-06-28 Yao Qi <yao.qi@linaro.org>
* aarch64-tdep.c (aarch64_displaced_step_b): Use int64_t for
......
......@@ -121,7 +121,7 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr,
if (strncmp (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX,
strlen (RUST_ENUM_PREFIX)) == 0)
{
char *name, *tail, *token;
char *tail, *token, *name, *saveptr;
unsigned long fieldno;
struct type *member_type;
LONGEST value;
......@@ -145,7 +145,9 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr,
traversed in order to find the field (which may be several fields deep)
and the variantname is the name of the variant of the case when the
field is zero. */
while ((token = strsep (&tail, "$")) != NULL)
for (token = strtok_r (tail, "$", &saveptr);
token != NULL;
token = strtok_r (NULL, "$", &saveptr))
{
if (sscanf (token, "%lu", &fieldno) != 1)
{
......@@ -161,7 +163,7 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr,
member_type = TYPE_FIELD_TYPE (member_type, fieldno);
}
if (token >= name + strlen (TYPE_FIELD_NAME (type, 0)))
if (token == NULL)
error (_("Invalid form for %s"), RUST_ENUM_PREFIX);
value = unpack_long (member_type, valaddr + embedded_offset);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment