From patchwork Thu Apr 16 19:23:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Turney X-Patchwork-Id: 6264 Received: (qmail 84442 invoked by alias); 16 Apr 2015 19:23:55 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 84357 invoked by uid 89); 16 Apr 2015 19:23:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 X-HELO: rgout06.bt.lon5.cpcloud.co.uk Received: from rgout06.bt.lon5.cpcloud.co.uk (HELO rgout06.bt.lon5.cpcloud.co.uk) (65.20.0.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 16 Apr 2015 19:23:53 +0000 X-OWM-Source-IP: 31.51.207.104(GB) X-OWM-Env-Sender: jonturney@btinternet.com X-RazorGate-Suspect: true X-CTCH-RefID: str=0001.0A090202.55300C47.0098, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Spam: Unknown Received: from localhost.localdomain (31.51.207.104) by rgout06.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 551516140261484E; Thu, 16 Apr 2015 20:23:51 +0100 From: Jon Turney To: gdb-patches@sourceware.org Cc: Jon Turney Subject: [PATCH 1/5] windows-nat: Don't use ternary conditional operator in get_windows_debug_event Date: Thu, 16 Apr 2015 20:23:25 +0100 Message-Id: <1429212209-20548-2-git-send-email-jon.turney@dronecode.org.uk> In-Reply-To: <1429212209-20548-1-git-send-email-jon.turney@dronecode.org.uk> References: <1429009382-21040-1-git-send-email-jon.turney@dronecode.org.uk> <1429212209-20548-1-git-send-email-jon.turney@dronecode.org.uk> gdb/ChangeLog: 2015-04-16 Jon Turney * windows-nat.c (get_windows_debug_event): Don't use ternary conditional operator. --- gdb/ChangeLog | 5 +++++ gdb/windows-nat.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index fd31083..dea4368 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -1502,7 +1502,9 @@ get_windows_debug_event (struct target_ops *ops, { inferior_ptid = ptid_build (current_event.dwProcessId, 0, retval); - current_thread = th ?: thread_rec (current_event.dwThreadId, TRUE); + current_thread = th; + if (!current_thread) + current_thread = thread_rec (current_event.dwThreadId, TRUE); } out: