From 1fc3cf4a5ac1e3dddf9aee7832fcd2b958ea399f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 30 May 2013 17:31:48 +0000 Subject: [PATCH] fix linux-thread-db.c This is a stylistic change to make it so the checker can analyze a function in linux-thread-db.c. * linux-thread-db.c (thread_db_load_search): Unconditionally call do_cleanups. --- gdb/ChangeLog | 5 +++++ gdb/linux-thread-db.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 89298e88b3..c2eb3bb8bd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-05-30 Tom Tromey + + * linux-thread-db.c (thread_db_load_search): Unconditionally + call do_cleanups. + 2013-05-30 Tom Tromey * solib-aix.c (solib_aix_bfd_open): Don't use a null cleanup diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c index a698c659fc..23c29c9dd1 100644 --- a/gdb/linux-thread-db.c +++ b/gdb/linux-thread-db.c @@ -1029,17 +1029,17 @@ thread_db_load_search (void) || this_dir[pdir_len] == '/')) { char *subdir = NULL; - struct cleanup *free_subdir_cleanup = NULL; + struct cleanup *free_subdir_cleanup + = make_cleanup (null_cleanup, NULL); if (this_dir[pdir_len] == '/') { subdir = xmalloc (strlen (this_dir)); - free_subdir_cleanup = make_cleanup (xfree, subdir); + make_cleanup (xfree, subdir); strcpy (subdir, this_dir + pdir_len + 1); } rc = try_thread_db_load_from_pdir (subdir); - if (free_subdir_cleanup != NULL) - do_cleanups (free_subdir_cleanup); + do_cleanups (free_subdir_cleanup); if (rc) break; }