From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8984E385C422 for ; Wed, 23 Aug 2023 13:55:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8984E385C422 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692798935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TVqNaL47lKKWytIEi0AiQAt634zUfdSSjVjahNa53EE=; b=c94/AdKNLX+3qT5FbkD5T61/FS/uXJoN6OgvZJ0BMB2aXruGj/AuIiPbfHitaWCld32naX pCrdQ2dvqeusOMxUwH7AjmUuui3kz67gaCStlSZ1JdNyHRF2Fc/cBAuilFZKrrTAtks8YA 1Ysq0sqzrTUWrjT4677Sa2Hz4ldmp3g= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-647-856xg4LkMPyV84g4huy7bQ-1; Wed, 23 Aug 2023 09:55:33 -0400 X-MC-Unique: 856xg4LkMPyV84g4huy7bQ-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-50daa85e940so3924232a12.0 for ; Wed, 23 Aug 2023 06:55:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798932; x=1693403732; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TVqNaL47lKKWytIEi0AiQAt634zUfdSSjVjahNa53EE=; b=AbygWij/c9maTdtE5NrjZI4en4PXEJyR82iZHnL80Y551ESYirEcdQFd4yddaL4Bqz LQMtHsQ/dH+rG/iKCVnkMGGtbcOthmPWMeArmonFaEwicJ7PyextTgUpOnXTS+pQNRJe x52izYK2/vx0ep+9kTO/hB1Ae/weStBH+aYispJn4nO8ffzpVeGwYzZPcEU5bsRbeIfK G+OWAXcHhdCu5wOCLFzD5bnioF9W30Oln2L+oUQl7Z0IDVTncorVHcaKGIz0fImo6ZWj USbA+vZZYqAvrdmdbJmaBQq0XZspDVhKP2xpJwsRZYJq5X4/ahSmIfvuKm1E1N4LrwHD RNqg== X-Gm-Message-State: AOJu0YyweovJw4J6Y1lpBppkXbqWUqHX6/KqHnPff2BsAZX619Xa4sXD 7lUjLxJkhA/886YMrwief1b/xYBGc748glbXlXIztf4t20C6hhHiIPvoSzsi75U4OpYkH1QD8Jd EwNWtcxAVJ04d1KoQUIxJlkQF/T41ngdGInKxMGJp4Z78fkYM/ahR1Pr8HwRWgX36DPj1qZOucy 1m8iDaAw== X-Received: by 2002:aa7:d688:0:b0:525:691c:cd50 with SMTP id d8-20020aa7d688000000b00525691ccd50mr9542665edr.24.1692798932146; Wed, 23 Aug 2023 06:55:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IER4R/NhVNmEdhAhq3tLI413RBtpePr5HVRUrPyZ6DBHu09zqWRnac0yQZ8perRV7nWbdcUYA== X-Received: by 2002:aa7:d688:0:b0:525:691c:cd50 with SMTP id d8-20020aa7d688000000b00525691ccd50mr9542650edr.24.1692798931800; Wed, 23 Aug 2023 06:55:31 -0700 (PDT) Received: from localhost ([31.111.84.232]) by smtp.gmail.com with ESMTPSA id v14-20020a056402184e00b0052a3edff5c3sm188214edy.87.2023.08.23.06.55.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:55:29 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PUSHED] gdb: fix up a few places where a char was treated as a bool Date: Wed, 23 Aug 2023 14:55:27 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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 List-Id: From: Alan Modra via Gdb-patches Spotted a few places where a char is being treated as a bool. The GDB style is to use explicit comparisons, so fix things up. There should be no user visible changes after this commit. --- gdb/coffread.c | 2 +- gdb/dbxread.c | 4 ++-- gdb/machoread.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/coffread.c b/gdb/coffread.c index 7998327fdaf..f8e14d8ad93 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -64,7 +64,7 @@ static const registry::key coff_objfile_data_key; /* Translate an external name string into a user-visible name. */ #define EXTERNAL_NAME(string, abfd) \ - (*string && *string == bfd_get_symbol_leading_char (abfd) \ + (*string != '\0' && *string == bfd_get_symbol_leading_char (abfd) \ ? string + 1 : string) /* To be an sdb debug type, type must have at least a basic or primary diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 4c585efd192..958b6db6615 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -486,7 +486,7 @@ record_minimal_symbol (minimal_symbol_reader &reader, { const char *tempstring = name; - if (*tempstring + if (*tempstring != '\0' && *tempstring == bfd_get_symbol_leading_char (objfile->obfd.get ())) ++tempstring; if (is_vtable_name (tempstring)) @@ -2255,7 +2255,7 @@ read_ofile_symtab (struct objfile *objfile, legacy_psymtab *pst) processing_gcc_compilation = 1; else if (strcmp (namestring, GCC2_COMPILED_FLAG_SYMBOL) == 0) processing_gcc_compilation = 2; - if (*tempstring + if (*tempstring != '\0' && *tempstring == bfd_get_symbol_leading_char (symfile_bfd)) ++tempstring; if (startswith (tempstring, "__gnu_compiled")) diff --git a/gdb/machoread.c b/gdb/machoread.c index 615e08c6afa..38c252c2861 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -394,7 +394,7 @@ macho_resolve_oso_sym_with_minsym (struct objfile *main_objfile, asymbol *sym) struct bound_minimal_symbol msym; const char *name = sym->name; - if (*name + if (*name != '\0' && *name == bfd_get_symbol_leading_char (main_objfile->obfd.get ())) ++name; msym = lookup_minimal_symbol (name, NULL, main_objfile); base-commit: d367563d55c0ff2bd406397c773bca767e8fccce -- 2.25.4