From 60685cd0b99c575a32c3d004b4af568dd0309bcb Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 23 Jan 2017 15:31:40 -0500 Subject: [PATCH] Minor simplification of (Python) find_thread_object Since the reference to the Inferior Python object is managed by gdbpy_ref (RAII), we can return directly from the loop. It's just a leftover from the cleanups era. gdb/ChangeLog: * python/py-inferior.c (find_thread_object): Return directly from the loop. Remove "found" variable. --- gdb/ChangeLog | 5 +++++ gdb/python/py-inferior.c | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c2f7654ce16..8704fb0ba8e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-01-23 Simon Marchi + + * python/py-inferior.c (find_thread_object): Return directly + from the loop. Remove "found" variable. + 2017-01-21 Joel Brobecker GDB 7.12.1 released. diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 9e10d62c518..b2aaf25e8a0 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -251,7 +251,6 @@ find_thread_object (ptid_t ptid) { int pid; struct threadlist_entry *thread; - thread_object *found = NULL; pid = ptid_get_pid (ptid); if (pid == 0) @@ -264,13 +263,7 @@ find_thread_object (ptid_t ptid) for (thread = ((inferior_object *)(inf_obj.get ()))->threads; thread; thread = thread->next) if (ptid_equal (thread->thread_obj->thread->ptid, ptid)) - { - found = thread->thread_obj; - break; - } - - if (found) - return found; + return thread->thread_obj; return NULL; } -- 2.30.2