From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id nm/IDtA13mkb2RYAWB0awg (envelope-from ) for ; Tue, 14 Apr 2026 08:40:48 -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=XYU/RNdI; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0u+PEsyX; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=XYU/RNdI; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0u+PEsyX; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2EB041E08C; Tue, 14 Apr 2026 08:40:48 -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 D4F461E08C for ; Tue, 14 Apr 2026 08:40:44 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 8ADDC4BA23E1 for ; Tue, 14 Apr 2026 12:40:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8ADDC4BA23E1 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=XYU/RNdI; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0u+PEsyX; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=XYU/RNdI; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0u+PEsyX Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id DBE444BA5439 for ; Tue, 14 Apr 2026 12:40:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DBE444BA5439 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 DBE444BA5439 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776170418; cv=none; b=VYHGQWQXeixOGbSqp8oTF1mjCCToQ0zBKF4SzMEQNMCWwxYdMP7qw1OOM5ei92XWt4rPKkkzvUS34Q4ikAgdNooLWMynx0z4krd4qDuWmvYm93L5Mp+ot5j3BWqeBcMp1Bj8z+BWLQBiR/l628mVXRGqFpAcQU7Qb3KpIACXkw8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776170418; c=relaxed/simple; bh=qTAf0yPMVmslzBThjOqmnqvr/1wDnabPR0azuFzMGiU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:From:To; b=rD1UiGEl9J8D9hONnsk5ax7DJl+igb7iiDBSqPTfUCErWfG3h2yrrPaUf717SNd81w7C7eDDMzcj4143ZYcmvTP8b2Li5G9kPnr8DLfSWScZA8bn4symC2GAmLF31R9d72oL8tMs2xNmQtsp+nwYd1nfBIyydISJXFfDtib6KlA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DBE444BA5439 Received: from imap1.dmz-prg2.suse.org (unknown [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-out1.suse.de (Postfix) with ESMTPS id 6E10F6A8FD for ; Tue, 14 Apr 2026 12:40:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776170415; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DtAqxgKvDF/lnivCcOGAspW6dz4ErOqAxOEou+Lp8xk=; b=XYU/RNdIX+htZmKFeQONDo3djTI42e+9FNn0m2jlXdlKMZcAMkbNN+sg12ufEb+kb7h/Gz O5tsh4U//ayE2d9xlrLY5yN+KcDEninI1/4t1mjqA9dePCcl+IZUczjPE0dtGQFMjpSj2f WB1syAvZYfEISzECzlMexGIrYFaHsGs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776170415; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DtAqxgKvDF/lnivCcOGAspW6dz4ErOqAxOEou+Lp8xk=; b=0u+PEsyXi2wEtMrVo9ns1anU5hgVbwHnuhCJ3dnCuz22kGSmZ+H6jpp8vs6FA9eBodMYmL SmRWyT1U+ERVdiDg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776170415; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DtAqxgKvDF/lnivCcOGAspW6dz4ErOqAxOEou+Lp8xk=; b=XYU/RNdIX+htZmKFeQONDo3djTI42e+9FNn0m2jlXdlKMZcAMkbNN+sg12ufEb+kb7h/Gz O5tsh4U//ayE2d9xlrLY5yN+KcDEninI1/4t1mjqA9dePCcl+IZUczjPE0dtGQFMjpSj2f WB1syAvZYfEISzECzlMexGIrYFaHsGs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776170415; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DtAqxgKvDF/lnivCcOGAspW6dz4ErOqAxOEou+Lp8xk=; b=0u+PEsyXi2wEtMrVo9ns1anU5hgVbwHnuhCJ3dnCuz22kGSmZ+H6jpp8vs6FA9eBodMYmL SmRWyT1U+ERVdiDg== 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 5B5094B44E for ; Tue, 14 Apr 2026 12:40:15 +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 xEjxFK813mn3DwAAD6G6ig (envelope-from ) for ; Tue, 14 Apr 2026 12:40:15 +0000 Message-ID: Date: Tue, 14 Apr 2026 14:40:15 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 1/4] [gdb] Simplify debuginfod_is_enabled From: Tom de Vries To: gdb-patches@sourceware.org References: <20260314173737.1436116-1-tdevries@suse.de> <20260314173737.1436116-2-tdevries@suse.de> Content-Language: en-US In-Reply-To: <20260314173737.1436116-2-tdevries@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo] 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 On 3/14/26 6:37 PM, Tom de Vries wrote: > Simplify debuginfod_is_enabled by adding an early-exit for the > debuginfod_enabled == debuginfod_on case. I've pushed this. I noticed I got the indentation of this bit wrong (I used emacs auto-ident): ... DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_STRINGOP_OVERREAD off = url_view.find_first_of (' '); DIAGNOSTIC_POP ... so I've fixed that before pushing. Thanks, - Tom > --- > 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. */