From patchwork Thu Dec 14 13:17:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 82139 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A066D38618B1 for ; Thu, 14 Dec 2023 13:17:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 2001A3857BB2 for ; Thu, 14 Dec 2023 13:17:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2001A3857BB2 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2001A3857BB2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702559830; cv=none; b=E+J3ziZwjUzkSPXSIxpvMovL2zM7LRZkG1n0qlEr+t0oRfZ5IWTN2D04bHe07SId/OjUH/pQ8nA2QtlEV3NcuX7MBBhivvF/F2INa+ToYRcTjhQB5U/YuMrQjS3h1/jg0A1HqTsbJSOQV2en9MxPoc0yXo6Ugp4XOsojO0nOe3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702559830; c=relaxed/simple; bh=8e2qGxkiFZ7p+I8Na/7KP3jOcf8FKhjJsuCaANBDmEM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=e0QKd0ugzqnfNJsQxv2ECQAqQduTCGwOOkXKAFVRgewZKayiPmIneP35caMllQ3Lxb+h6HHc1IWyCzx39fRgVOoYI7DzxOTOfNUP5IbKJ4iSUIZMgUKZtmc3539XlLDJFWZ7K8U+W27gooX7VZ3b7PxLhUEJrUBLSYpFKji90jg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702559828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QR98YYeao8bbYJcoW2ihpAbfOECE5Kg63OjvDtWdiwc=; b=IXdxXt82Tpi+PDUGKa9nNIaZAOyCRJER3NTS0m26ta9uqwFftEm0zKCELSd5RXZt9vwZZN odWEaOpA23G090o+zNbDrL3oCeJWP0hCvtiNn2dcVwfVTmGxglUwnbAxwXYZTF17po7Yd5 sn7MfPSWowz4Joe9sbEz3wXoqV0fKkU= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-2vwyGlIMNp-lVN7OJ7BDKg-1; Thu, 14 Dec 2023 08:17:07 -0500 X-MC-Unique: 2vwyGlIMNp-lVN7OJ7BDKg-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40c22bc1ebdso3513265e9.1 for ; Thu, 14 Dec 2023 05:17:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702559825; x=1703164625; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QR98YYeao8bbYJcoW2ihpAbfOECE5Kg63OjvDtWdiwc=; b=QZC+QQXmrfLIEU5ickM9wSxym3y/2vmQLJKrUAwUBVjvVxek0EF8dCuyNtZT3V9Oo9 vfltR3PokS2+zQ62coPWh7YOzYQQ2T3GPcmK4NGjw/mJJ8wVuxVxPeMxpqLPRia31gEa Qcy0gwK3Aq/lw5PYFAasqs6xBiRqDC+Fk8odfQZ7cmndQbqM+9aNvARiUyDdd/JzcCAL BHSk10YeKG1SbVby+n1p64xSOkMZV5lTV5oKOBuQFGg5v37CYDySAM9gf3CcJPu9+k+a FWdCZx08VIMByHyGnlcX+MMbm1xy10EI+cekQ7Y/MekDzP1K1T2jY64d+QVgTD7Mklzf TTMw== X-Gm-Message-State: AOJu0Yz6hjoHi6/s0HYziVk3WiwkYvkVJjopavCp+ds4qg+J1YKfTTkC p0fujkq7at4+IYsqKGIe/4PI1GXIyxvOrBBrPwHkFZnLxV3h/PQvd9jADEqoDzGqVWEtmmJoch1 BCKzdnSn+aX5DNNzKF6fn02vWmpeHfox2gWpu4wtARYG0ZWCrrlgvk/u5/e42JXrngc4YXxM4p0 3/b2Mf1Q== X-Received: by 2002:a05:600c:4897:b0:40c:2b49:460d with SMTP id j23-20020a05600c489700b0040c2b49460dmr4758685wmp.135.1702559825292; Thu, 14 Dec 2023 05:17:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoB2axgF4gNPgxLBMFD/cii4+QN6fE+a22qbHOUoTeVyXBuuZBHobGGtFA/KwVCuJGP1zd0g== X-Received: by 2002:a05:600c:4897:b0:40c:2b49:460d with SMTP id j23-20020a05600c489700b0040c2b49460dmr4758673wmp.135.1702559824826; Thu, 14 Dec 2023 05:17:04 -0800 (PST) Received: from localhost (105.226.159.143.dyn.plus.net. [143.159.226.105]) by smtp.gmail.com with ESMTPSA id v23-20020adfa1d7000000b003364a5d1d20sm1151589wrv.16.2023.12.14.05.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 05:17:04 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb/options: fix copy&paste error in string_option_def Date: Thu, 14 Dec 2023 13:17:00 +0000 Message-Id: <7d5ab0d95447c98d8581a94c1e1568dd44ffdf34.1702559691.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 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_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Spotted what appears to be a copy&paste error in string_option_def, the code for string handling writes the address fetching callback function into the option_def::var_address::enumeration location, rather than option_def::var_address::string. Of course, this works just fine as option_def::var_address is a union, and all of its members are function pointers, so they're going to be the same size on every target GDB cares about. But it doesn't hurt to be correct, so fixed in this commit. There should be no user visible changes after this commit. --- gdb/cli/cli-option.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 5c5e642dc0f6b223c2339d8dee64fbc63eee8e1a diff --git a/gdb/cli/cli-option.h b/gdb/cli/cli-option.h index 4c62227f31c..2645c58188c 100644 --- a/gdb/cli/cli-option.h +++ b/gdb/cli/cli-option.h @@ -304,7 +304,7 @@ struct string_option_def : option_def show_cmd_cb_, set_doc_, show_doc_, help_doc_) { - var_address.enumeration = detail::get_var_address; + var_address.string = detail::get_var_address; } };