diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 6 | ||||
| -rw-r--r-- | gdb/mi/mi-parse.c | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 77b7a97d60c..37cf2cff8f4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2011-04-29 Tom Tromey <tromey@redhat.com> + + * mi/mi-parse.c (mi_parse): Remove incorrect sizeof. + (mi_parse): Likewise. + * breakpoint.c (break_range_command): Use sizeof char*, not + char**. + (create_breakpoint): Likewise. + (parse_breakpoint_sals): Likewise. + 2011-04-29 Pedro Alves <pedro@codesourcery.com> * linux-nat.c (linux_child_remove_fork_catchpoint) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 01bb08cbeff..b9d76c7cde9 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -7698,7 +7698,7 @@ parse_breakpoint_sals (char **address, } /* For any SAL that didn't have a canonical string, fill one in. */ if (sals->nelts > 0 && canonical->canonical == NULL) - canonical->canonical = xcalloc (sals->nelts, sizeof (char **)); + canonical->canonical = xcalloc (sals->nelts, sizeof (char *)); if (addr_start != (*address)) { int i; @@ -7917,7 +7917,7 @@ create_breakpoint (struct gdbarch *gdbarch, sals = decode_static_tracepoint_spec (&arg); copy_arg = savestring (addr_start, arg - addr_start); - canonical.canonical = xcalloc (sals.nelts, sizeof (char **)); + canonical.canonical = xcalloc (sals.nelts, sizeof (char *)); for (i = 0; i < sals.nelts; i++) canonical.canonical[i] = xstrdup (copy_arg); goto done; @@ -8573,7 +8573,7 @@ break_range_command (char *arg, int from_tty) /* canonical_end can be NULL if it was of the form "*0xdeadbeef". */ if (canonical_end.canonical == NULL) - canonical_end.canonical = xcalloc (1, sizeof (char **)); + canonical_end.canonical = xcalloc (1, sizeof (char *)); /* Add the string if not present. */ if (arg_start != arg && canonical_end.canonical[0] == NULL) canonical_end.canonical[0] = savestring (arg_start, arg - arg_start); diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index fcaf1512421..a46274aab9a 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -253,7 +253,7 @@ mi_parse (char *cmd, char **token) /* Find/skip any token and then extract it. */ for (chp = cmd; *chp >= '0' && *chp <= '9'; chp++) ; - *token = xmalloc ((chp - cmd + 1) * sizeof (char *)); + *token = xmalloc (chp - cmd + 1); memcpy (*token, cmd, (chp - cmd)); (*token)[chp - cmd] = '\0'; @@ -276,7 +276,7 @@ mi_parse (char *cmd, char **token) for (; *chp && !isspace (*chp); chp++) ; - parse->command = xmalloc ((chp - tmp + 1) * sizeof (char *)); + parse->command = xmalloc (chp - tmp + 1); memcpy (parse->command, tmp, chp - tmp); parse->command[chp - tmp] = '\0'; } |