From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CVmPIyOdtWkKYCkAWB0awg (envelope-from ) for ; Sat, 14 Mar 2026 13:38:43 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qfAt3DcT; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0lEIolFQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=AvE/g0Dh; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=mv5kpvV/; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 8C38F1E0DD; Sat, 14 Mar 2026 13:38:43 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 7E23F1E089 for ; Sat, 14 Mar 2026 13:38:42 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id D472B4C318BC for ; Sat, 14 Mar 2026 17:38:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D472B4C318BC Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qfAt3DcT; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0lEIolFQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=AvE/g0Dh; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=mv5kpvV/ Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 08DC94BB3BF2 for ; Sat, 14 Mar 2026 17:37:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 08DC94BB3BF2 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 08DC94BB3BF2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1773509859; cv=none; b=T5uZMg44I33fvJR3iR9hMo9MAdw2pN+dTZq9uke1epXYNVumqzl0pqSjT1R4xTpHoDQNblx5cHGE2A9/dyNfSOtupNuk+fHWbUe06ot0y5r19PM2/6fSEjjq0RyaDtU4wSPTIBHJeKCqiUBpdXvTKAjrp2l9uXDlVqM9XI/CIhg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1773509859; c=relaxed/simple; bh=56NF5abQN0n9R85l3uEAYA9LNu1w+2Nj9esPcQaoudY=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=SLD+RPq4f35DHRjcqEua5EluZc3+p4Cjo7bIy3X7oAYDyeV9XHy2xwyy3hlm5rl7g+BH2dhTb9CDot9BAdys9gQXcK6bR6R1BA/CifHxDTxRgQk9oi/Z6+0NGdIDmv/jhUFg16UIsb6thsQkdIOgA0sQua9fV7Lxrm+xDKZcRMw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08DC94BB3BF2 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DBECA5BCF7 for ; Sat, 14 Mar 2026 17:37:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773509858; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBPku7Eu33HCNt/IdOv8IyY2YQd+VJfubB1y25yse8w=; b=qfAt3DcTVj9cLfTV2MVgcaL9DRYAAp8gEyqxgGEbohFcFWu/K2QMg96UDAVsAVdUUAFAVj lh0/mbe7enLtjUpVLxIabiBozlOMkhbGfN7pKYZatWMT04jnFHmJvIhKjRgBT0bRZzAzah tnzEacodRcGtOWzmbXXXPhWVNTXqnQE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773509858; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBPku7Eu33HCNt/IdOv8IyY2YQd+VJfubB1y25yse8w=; b=0lEIolFQ8cmQNL6FYF0lDelTw7lAzTjZstAAilRzHkSCR6zItnPTT36IK5zae/OdNRLIWR oCd89jRb2Qb1rXAQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="AvE/g0Dh"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="mv5kpvV/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773509857; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBPku7Eu33HCNt/IdOv8IyY2YQd+VJfubB1y25yse8w=; b=AvE/g0DhOtqv+sQzMMuohf1Ml+somr6HBI7ckjsIwQf9qVpmVlD5STn4kqNwqIXVlQf74l wvgZH5P4Ke8FHl+kDAYjIpIY/TB7L85TKiqeZBgLH6yO1v5qGP6fuF5HpwM0+EZZXhArd5 saBG3xY07XgwmQ+Z56aIl9j5GRYa5Gk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773509857; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBPku7Eu33HCNt/IdOv8IyY2YQd+VJfubB1y25yse8w=; b=mv5kpvV/LVKXtvEPGcEP7mqmZrJMPB4M2kTBmTMANUc4Crgcqqs0gL4TakDampK3r56n2R eP4b5UGclIFxfvBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B7B8942725 for ; Sat, 14 Mar 2026 17:37:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id GPx0K+GctWnNeQAAD6G6ig (envelope-from ) for ; Sat, 14 Mar 2026 17:37:37 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v5 1/4] [gdb] Simplify debuginfod_is_enabled Date: Sat, 14 Mar 2026 18:37:34 +0100 Message-ID: <20260314173737.1436116-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260314173737.1436116-1-tdevries@suse.de> References: <20260314173737.1436116-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received,2a07:de40:b281:104:10:150:64:97:from]; ASN(0.00)[asn:32098, ipnet:2800::/6, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:dkim, suse.de:mid] X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: DBECA5BCF7 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Simplify debuginfod_is_enabled by adding an early-exit for the debuginfod_enabled == debuginfod_on case. --- gdb/debuginfod-support.c | 81 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c index 3da3edc432d..ca4a5b1a7af 100644 --- a/gdb/debuginfod-support.c +++ b/gdb/debuginfod-support.c @@ -232,57 +232,58 @@ debuginfod_is_enabled () { const char *urls = skip_spaces (getenv (DEBUGINFOD_URLS_ENV_VAR)); - if (debuginfod_enabled == debuginfod_off - || urls == nullptr + if (urls == nullptr || *urls == '\0') return false; - if (debuginfod_enabled == debuginfod_ask) - { - gdb_printf (_("\nThis GDB supports auto-downloading debuginfo " \ - "from the following URLs:\n")); + if (debuginfod_enabled != debuginfod_ask) + return debuginfod_enabled == debuginfod_on; - std::string_view url_view (urls); - while (true) - { - size_t off = url_view.find_first_not_of (' '); - if (off == std::string_view::npos) - break; - url_view = url_view.substr (off); - /* g++ 11.2.1 on s390x, g++ 11.3.1 on ppc64le and g++ 11 on - hppa seem convinced url_view might be of SIZE_MAX length. - And so complains because the length of an array can only - be PTRDIFF_MAX. */ - DIAGNOSTIC_PUSH - DIAGNOSTIC_IGNORE_STRINGOP_OVERREAD - off = url_view.find_first_of (' '); - DIAGNOSTIC_POP - gdb_printf - (_(" <%ps>\n"), - styled_string (file_name_style.style (), - std::string (url_view.substr (0, off)).c_str ())); - if (off == std::string_view::npos) - break; - url_view = url_view.substr (off); - } + gdb_printf (_("\nThis GDB supports auto-downloading debuginfo " \ + "from the following URLs:\n")); - int resp = nquery (_("Enable debuginfod for this session? ")); - if (!resp) - { - gdb_printf (_("Debuginfod has been disabled.\nTo make this " \ - "setting permanent, add \'set debuginfod " \ - "enabled off\' to .gdbinit.\n")); - debuginfod_enabled = debuginfod_off; - return false; - } + std::string_view url_view (urls); + while (true) + { + size_t off = url_view.find_first_not_of (' '); + if (off == std::string_view::npos) + break; + url_view = url_view.substr (off); + /* g++ 11.2.1 on s390x, g++ 11.3.1 on ppc64le and g++ 11 on + hppa seem convinced url_view might be of SIZE_MAX length. + And so complains because the length of an array can only + be PTRDIFF_MAX. */ + DIAGNOSTIC_PUSH + DIAGNOSTIC_IGNORE_STRINGOP_OVERREAD + off = url_view.find_first_of (' '); + DIAGNOSTIC_POP + gdb_printf + (_(" <%ps>\n"), + styled_string (file_name_style.style (), + std::string (url_view.substr (0, off)).c_str ())); + if (off == std::string_view::npos) + break; + url_view = url_view.substr (off); + } - gdb_printf (_("Debuginfod has been enabled.\nTo make this " \ + int resp = nquery (_("Enable debuginfod for this session? ")); + if (!resp) + { + gdb_printf (_("Debuginfod has been disabled.\nTo make this " \ + "setting permanent, add \'set debuginfod " \ + "enabled off\' to .gdbinit.\n")); + debuginfod_enabled = debuginfod_off; + } + else + { + gdb_printf (_("Debuginfod has been enabled.\nTo make this " \ "setting permanent, add \'set debuginfod enabled " \ "on\' to .gdbinit.\n")); debuginfod_enabled = debuginfod_on; } - return true; + gdb_assert (debuginfod_enabled != debuginfod_ask); + return debuginfod_enabled == debuginfod_on; } /* Print the result of the most recent attempted download. */ -- 2.51.0