From patchwork Thu Dec 14 19:53:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 24946 Received: (qmail 43699 invoked by alias); 14 Dec 2017 19:53:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 43682 invoked by uid 89); 14 Dec 2017 19:53:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 14 Dec 2017 19:53:54 +0000 Received: from ESESSHC016.ericsson.se (Unknown_Domain [153.88.183.66]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id E6.86.27591.FC6D23A5; Thu, 14 Dec 2017 20:53:52 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.66) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 14 Dec 2017 20:53:37 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by AMSPR07MB312.eurprd07.prod.outlook.com (2a01:111:e400:802f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.323.4; Thu, 14 Dec 2017 19:53:35 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] py-breakpoint: Don't use the 'p' PyArg_ParseTupleAndKeywords format specifier Date: Thu, 14 Dec 2017 14:53:21 -0500 Message-ID: <1513281201-9279-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: MWHPR2201CA0096.namprd22.prod.outlook.com (2603:10b6:301:5e::49) To AMSPR07MB312.eurprd07.prod.outlook.com (2a01:111:e400:802f::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ff4b046-5ce7-440b-c508-08d5432c5d00 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:AMSPR07MB312; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 3:ydBStBDMC5IhQ8Dcvg49g/nYmgys2cTPsbbO4KkxfRHloWnGNmKhjsVTsprNUBIG8IaciMHvSXbGOE/Lwev0d9KzfxoDIluvVPYhSci9IElzrIdVz21QclgHjiBiwmuNLQ8VOa2SRffmPEjl5/jTa/DB7KAbziNQKm8iqyP2IDsks94ur/dDtglrhtAm7eTGQ//sswl6c9C8zUz+2pFCqBZ4O3sbPeYrGNd+8uLuYZQwnM7Fe5pWB1Goop7mG8Bv; 25:6tdBIpdCUaOLCFCEOrHwCGdUH3gFSc/HKTzqjp4eI51c7BPOtkqUIEOunSdCRGrleA1N15Ezf+y1RXgMFS2/nWjvahdZLwHR9YLpi9x6Ocp2diGGnSazBH06Ueoe9TDIZQO0XBxuHRDeno/36hqaGZc+Yr1UacgqHXM/IH2QDa/Mozcmr6leYKRNKaRvCQezku0pMjr7Yifv2r+qHRUlmM32XQOTLwoFrL9ybs3hQS3xhGYoxCxz5A2hPUIrlt8OAVMJhgbfI6vKlNE74KDY4tFmSLzFK3GFZ30J2i0+EX/cTqAHX/03aIgO0wjTwwBgU2tIzhFssQfG299SWYekNA==; 31:KhKKDXVzSO5h9Ok1b9A4cgqOnjqp62pB5lEgykk6InK56FxKMeuzucyeuh5a5q9ggmtK5g2qbj+VSELRvhEESgNrD257ZoEAWI7WhEh6MJ9ka3/sr+3inAzqYNtE1Nv4YyYeitKWukoicNz8rxnYgYjWQjDmIeDJbLyDO3RbogT0+/KIZQl2Ibs2T/01ngyzDGc63G+nfa0gzvq73g9KrBVz+E25HCBsfb59fWAIkd0= X-MS-TrafficTypeDiagnostic: AMSPR07MB312: X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 20:28DL+bh0Fzvf+HOi92WvPQrEIOJtgIxUZjNoWuWw3oc1oEov7mbch+pePSlld53s80yEOR97SzRpsDLMsj0Zp1cQMaLNXUy6FBi0IQ2s+pnEOzmse/OJaicvQ5jb3/3jlJDV81Mtj7ZOWd2ZGgI6AuptQLzPPXkZQpfPb770XoViGYcMjzCREVzhpqA5/eCdnICl8nhym7563cRqtAX8rmPCB9UImnxvVJKrkPKl4Ch29D/C29eX5j//3JJ4eOMMuVP7/Bj0cy4IVVKh2LIRWO+/WAU4DfFgPYN4S+hggNhpgk9EJ211FGu2pWo0XCGuFc4kQDrhK1PO3jloMaqXyvpIt1avkXApP4ynfpoZlgfBc+AkBKA0gh/agP9Q/Ez9+qsJTcgBiIwIAdL2F75pdAy7XXBLbNd7p5cOH3y2LwZVc7Pmm6ziBewHz8rHeezGcK2alZoIg2ldEIUgwJTyIbDNok7+Or3oDdaCAauOnAuKII37ATIXr0o+uNO961VE; 4:iouwEdhEgO9zU3Y3KAtntLuRiu6QiOW7TpNggcURjaWW4FPVK8wV4wQeTQBj+VFddSZPqmeIrM6Ip1DZ6mWLn8K7UDlhIa9zvC0aoxMkgCxyWX0cwPE4bA9QWRbOk5r+AxhOx3rcnwZ7YA1/tQhQtGR2ygr919zGJmzZXuACJQK1Ysik89pVhfGHFNYNHs60HwBrTADGwkqJN2Z3DcWPQgo42m25o8UEFMcbM3245G2g227Rm459F6KKuVFkRkFiZPcChp8RIVLtPOjrW81B5Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3231023)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123560025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(6072148)(201708071742011); SRVR:AMSPR07MB312; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AMSPR07MB312; X-Forefront-PRVS: 05214FD68E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6029001)(346002)(396003)(366004)(376002)(39860400002)(189003)(199004)(54534003)(8936002)(16586007)(6486002)(52116002)(81156014)(50226002)(68736007)(86362001)(59450400001)(16526018)(107886003)(25786009)(4326008)(316002)(81166006)(51416003)(3846002)(6512007)(2351001)(36756003)(6116002)(2361001)(305945005)(5660300001)(7736002)(48376002)(6666003)(8676002)(105586002)(106356001)(50466002)(6916009)(53936002)(66066001)(47776003)(2906002)(478600001)(6506007)(386003)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:AMSPR07MB312; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AMSPR07MB312; 23:ZG062n18Ic2VzRq6ZjbgzHGmXb/ViiTsE5Ucs2ca8y?= =?us-ascii?Q?za6kK8BNxW8HrGwBv6n99w74DRFVt+89Iywj7gb3urYMFw7fvjnlXwLD3Jdy?= =?us-ascii?Q?Mu4SfDtjV5zCgl+WTR46Oyk4xIgILQTbmkKh+uvPt23UcyvtjkJ1dztl6deW?= =?us-ascii?Q?FHH562MYWZAYpoECdrriEM8KKH796+irlAzxYlUX90mykUUDq577mTMzW8hh?= =?us-ascii?Q?aXqcQRJSpBbz0UEZ0kKQLPO3r/GqXHltzxGHQAS+uRMUt8T6EMrYqIACRGb8?= =?us-ascii?Q?BZ4G24YZ5+w33d41jeo6JNcbH/aF9lTvBySXOmaLh/KyWLbvVIKCJaiN7A86?= =?us-ascii?Q?BnP7NeCJV7RDKT92UMKmuW9JcF8EUQ84hgqfNl7HfUFKFtJIwJOIX3RdzbDu?= =?us-ascii?Q?bpAdq1B9IBUME7Q4DxpG9GpIjBHzDPtgCZKOCj13CXWyx6KNnT/JOlo6CrwF?= =?us-ascii?Q?SbCeaBqvH1VCf2Tkg9m4suB3ypFFSwLKbBExwVKenrXiXop5uui+g3Olqweh?= =?us-ascii?Q?KjbDdTpZB5xqq0UfQzLxokHClj7G+cTxkOvy6qSS+/wFTe32jDT0p8o7xpDD?= =?us-ascii?Q?CwJHCe3k1IEJMuX3gNKThFhXqdd432j3h91F5+sIL4laaN82uNnMzn8OeabJ?= =?us-ascii?Q?egI3x4SpDcQg6hW7RV17EVWxkGW0UYsVd1C3LlD+s6VJbKaKsFikWantx/Dx?= =?us-ascii?Q?pCN7Pk1YU+yJr2KaAEoHzgY4jnaczKTFKHaOEJV3iUrfyrokp39hPKh8CxWj?= =?us-ascii?Q?IhsfofhOZgHDXF2a0ijHjjTF2rx7C9tHjCAbzE7vPq4ds5PMI0825Ts9Et6f?= =?us-ascii?Q?CXiIOkLDlAGF3ohi9i9w8Qy4ive62hCNCTU6MqpEAHedf2mlZ/LRw/k8Qt2c?= =?us-ascii?Q?tEuP8fHkjJUFcIig2LoqpR3lCiZfFM2tWaJeGIwYOIbNKeFWQOb6K/i5xOVl?= =?us-ascii?Q?E2P0bKwUtY/VuiT6lqdJLNLWBxZx1IY7++mZGGp5v8VkAXHseFJSEDWFZHz+?= =?us-ascii?Q?5f4DMcep1kfyHMjQAG08deg30yc/Ae7ssMLBgXBe+Yf7BGwD3koSHagCbPxk?= =?us-ascii?Q?YJ5gqjRvkxrMRU55lh12jsAekaRx7W67JdhwLsPcKKFgL2Ni7pE5NePUl9GH?= =?us-ascii?Q?AqHzoqpkY=3D?= X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 6:2AsFDPIS+dy+JagnCyStnH4mR/katclIt3+IOYqvifMEvLuEk3u6lC1O5oaI2lhpCFfZKb1mJI1fiXJRtrDiH/b4SGTC07Jc9bangu0QJ46OgAcwiaDQOhUhYWCh2bM3t9ExJqkD4jXf5iDvWlJls8R+oByreE0UzqlTcbdF/M2294JdyMJndM8fX6VkiApTu+D/VtQGsQirgvC/caCRPhk5a24ll5Tz7l+a1hS5DooH1nMgGZRa6UEBW42mxzrpwz5AS8+iTfkZFuY75kwK1s++rFJuzJQfbA2u1JqykTXI6Pxm7+WEV3Q2okRAl2Fo5vxUsXalBgwKVZxWRLo3GCCL/lXSy4cKT+i2D7dZTfY=; 5:7Byk+X52vycffju2y7IQd3qyoEv9UZhCZ+/Ki9fAn08k3Bt52cQC+RMGY2nOqfISvvQwUCrc0/5OetWlRj6KR3kojC4OU2dGmHKRBmTr4zvTj3bHvolUuvTqOwNCblNDw1JoJTPhAyyDs+sbwaqe5JDyGZ+tFehTguuqpkAtfkU=; 24:Km1MGq8WHI8tN4fQoP9rQ1MNeqmBz//BnLXNilz4LT0ubM+dze73h0Eg4QZJcInojpcLJGQv0JWQ4CiKcCdcmxbUJMPn9UlXydwt+bSig6Q=; 7:IBV/2hoR4VR6PO8iGoAvt4rYLMWZEEy00G10a0HvIsCrtl5g5UvJQYgjN7DN75X2l40Gqv+KX2vBcDR9/ZfOkgNALVWfKI+7yI6ago0MBe6J9Yufb8fw0aPlhzueAIKBCzgCd8oDULWKRYA1jza2xDXueKdgTF3BC5HIf8hNVTdErrzBkyc7aAsW4CfrcH/Hu4jN99aR1S+ou9SXHAVVomzhNLfoHJblEzRePCQdc8zqfEKu5VdI7/5jfcTG9HCD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2017 19:53:35.1059 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ff4b046-5ce7-440b-c508-08d5432c5d00 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB312 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes In Python 3, the 'p' format specifier can be passed to PyArg_ParseTupleAndKeywords to test the argument for truth and convert it to a boolean value (the p stands for predicate). However, it is not available in Python 2, causing this error: Traceback (most recent call last): File "test.py", line 1, in b1 = gdb.Breakpoint("foo", qualified=False) TypeError: argument 10 (impossible) This patch changes it to the 'O' specifier, which returns the Python object passed in without transformation, and uses PyObject_IsTrue on it. This is what is done for the other boolean parameters of this function (internal and temporary). This fixes the test gdb.python/py-breakpoint.exp for Python 2. gdb/ChangeLog: * python/py-breakpoint.c (bppy_init): Use 'O' format specifier for "qualified" and use PyObject_IsTrue. --- gdb/python/py-breakpoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index ce680c4..05291b5 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -707,9 +707,9 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) char *label = NULL; char *source = NULL; char *function = NULL; - int qualified = 0; + PyObject * qualified = NULL; - if (!gdb_PyArg_ParseTupleAndKeywords (args, kwargs, "|siiOOsssOp", keywords, + if (!gdb_PyArg_ParseTupleAndKeywords (args, kwargs, "|siiOOsssOO", keywords, &spec, &type, &access_type, &internal, &temporary, &source, @@ -762,7 +762,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) { event_location_up location; symbol_name_match_type func_name_match_type - = (qualified + = (qualified != NULL && PyObject_IsTrue (qualified) ? symbol_name_match_type::FULL : symbol_name_match_type::WILD);