Use delete instead of xfree for gdb_timer

Message ID 1496242063-23089-1-git-send-email-simon.marchi@ericsson.com
State New, archived
Headers

Commit Message

Simon Marchi May 31, 2017, 2:47 p.m. UTC
  gdb_timer objects are new'ed in create_timer, but xfree'd in
poll_timers.  Use delete instead.

gdb/ChangeLog:

	* event-loop.c (poll_timers): Unallocate timer using delete
	instead of xfree.
---
 gdb/event-loop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Simon Marchi June 2, 2017, 9:25 p.m. UTC | #1
On 2017-05-31 16:47, Simon Marchi wrote:
> gdb_timer objects are new'ed in create_timer, but xfree'd in
> poll_timers.  Use delete instead.
> 
> gdb/ChangeLog:
> 
> 	* event-loop.c (poll_timers): Unallocate timer using delete
> 	instead of xfree.
> ---
>  gdb/event-loop.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/event-loop.c b/gdb/event-loop.c
> index 4b3ddb8..7304ca7 100644
> --- a/gdb/event-loop.c
> +++ b/gdb/event-loop.c
> @@ -1270,7 +1270,7 @@ poll_timers (void)
>        /* Delete the timer before calling the callback, not after, in
>  	 case the callback itself decides to try deleting the timer
>  	 too.  */
> -      xfree (timer_ptr);
> +      delete timer_ptr;
> 
>        /* Call the procedure associated with that timer.  */
>        (proc) (client_data);

I pushed this in.

Simon
  

Patch

diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 4b3ddb8..7304ca7 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -1270,7 +1270,7 @@  poll_timers (void)
       /* Delete the timer before calling the callback, not after, in
 	 case the callback itself decides to try deleting the timer
 	 too.  */
-      xfree (timer_ptr);
+      delete timer_ptr;
 
       /* Call the procedure associated with that timer.  */
       (proc) (client_data);