From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by sourceware.org (Postfix) with ESMTPS id 973BA3858405 for ; Fri, 22 Jul 2022 18:56:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 973BA3858405 Received: by mail-il1-x130.google.com with SMTP id d4so2723991ilc.8 for ; Fri, 22 Jul 2022 11:56:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fedHGqbpdpLfuoXa0IG7BbLtOW9MYRgFFGEmOodhbkQ=; b=7j8DE/K+Z5sN8k1uJGUYGwVG8NV0MFFhOXazo4E+HonFQ9FF/ZJ4/77OJlEEeXyLvO YoYxaKuF+jUEx3D2w6LRMLzKph5hcC0LSdCm8B34ClVuUgHSSSif1/Cibvb6QAZczQuJ 5CEzEUp0PWfMVuHhdDBXciZVXIKlJ6C2k+di/jlwSND3geKsyEopk/qIHk6Pus33bA4f qEO5ugYvtT3Ddy4fbdgprukuoOkl0ab/ZZ+NkkPQnqgQZlX23ciiifxzJ4MVDViM5gZA Ajh2W0wzRTsc/OgSnrbuCR3ZB5NuaWT98TLwPXUS18xnYs9YUcRprOlBh9XA7K5rTo/3 np0Q== X-Gm-Message-State: AJIora/jsiwyn5hmpf2s/vp/1YT77bNChgeBHQ0PR7hXCQdqil94v7Gx jtz9TbIbtu/7nXQ8P0L03JuLMHNywL+mUQ== X-Google-Smtp-Source: AGRyM1ujz9xTFgYOOhC/eXygbQP258j9fX5ENk68uvSPvAiH4uy6QzXk977FiKcI+sXBDcDiu2V+kQ== X-Received: by 2002:a92:c566:0:b0:2dc:7f17:820b with SMTP id b6-20020a92c566000000b002dc7f17820bmr577614ilj.23.1658516203735; Fri, 22 Jul 2022 11:56:43 -0700 (PDT) Received: from murgatroyd.Home (71-211-185-228.hlrn.qwest.net. [71.211.185.228]) by smtp.gmail.com with ESMTPSA id k4-20020a0566022d8400b0067be568081fsm2473267iow.43.2022.07.22.11.56.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 11:56:43 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Remove dead code from windows_nat_target::detach Date: Fri, 22 Jul 2022 12:56:41 -0600 Message-Id: <20220722185641.4053809-1-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2022 18:56:45 -0000 windows_nat_target::detach has a variable 'detached' that is only set after a call to 'error'. However, this can't happen because 'error' throws an exception. This patch removes the dead code. --- gdb/windows-nat.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 43a2c112db5..9265ed9e632 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -1912,22 +1912,16 @@ windows_nat_target::attach (const char *args, int from_tty) void windows_nat_target::detach (inferior *inf, int from_tty) { - int detached = 1; - ptid_t ptid = minus_one_ptid; resume (ptid, 0, GDB_SIGNAL_0); if (!DebugActiveProcessStop (windows_process.current_event.dwProcessId)) - { - error (_("Can't detach process %u (error %u)"), - (unsigned) windows_process.current_event.dwProcessId, - (unsigned) GetLastError ()); - detached = 0; - } + error (_("Can't detach process %u (error %u)"), + (unsigned) windows_process.current_event.dwProcessId, + (unsigned) GetLastError ()); DebugSetProcessKillOnExit (FALSE); - if (detached) - target_announce_detach (from_tty); + target_announce_detach (from_tty); x86_cleanup_dregs (); switch_to_no_thread (); -- 2.34.1