From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753244AbbHaVQu (ORCPT ); Mon, 31 Aug 2015 17:16:50 -0400 Received: from mail-bn1on0112.outbound.protection.outlook.com ([157.56.110.112]:3846 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752038AbbHaVQs (ORCPT ); Mon, 31 Aug 2015 17:16:48 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Date: Mon, 31 Aug 2015 16:16:37 -0500 From: Scott Wood To: , Steven Rostedt CC: Dave Chinner Subject: [PATCH] tools lib traceevent: Support %ps/%pS Message-ID: <20150831211637.GA12848@home.buserror.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [2601:448:8100:f9f:12bf:48ff:fe84:c9a0] X-ClientProxiedBy: CY1PR1001CA0031.namprd10.prod.outlook.com (25.163.136.41) To BY1PR03MB1484.namprd03.prod.outlook.com (25.162.210.142) X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1484;2:Ya2VH7c8rL8Jqu6lzhONWiqrLxdxVMZmF1hmnm2pY3cruuAGaRrqFGElc6psgfCMAD655teQ25sSmqRfSNM6wF/Mdr+KwkWu8l5T5agx4V39OJ/Y/b0SmIHQ34ujA3tkDyjpu4hKSawFH4MYQ/ppSHQra6j0QFiw4RTdmI8/hH4=;3:n4eNxTcPh0ucAxNt7+Ka3rlY6WaS0qS3i6oVg61+JTXtTAe/fnQgTniMnh/Qd4r1RNoecsdp0INs6xmDMnkTtX/JONahTjGNZ9jwOicHoBsXXqU9SqqRf24FNviW2wfbLH6nH1vl0X6wShw95pe7Tw==;25:dF/nyxjg66scYlr0Bs+pQjp+ZHFrwVgN03Hi5GaFHcExesnpEmQx9b7OMF78B5+xIp3toZn6Rgnjtbrkfj+bqoxfnEQy1vJ7Upu7meGCKiKD6/7R8GJosB8C7491u9rwbBPhva0EV8igdrv1V50WnEWGGj3k4Ig6ArTp6fKkGSg1qhmjClDvYo14YRbVPNA8UoBCVdqDKpOqGi577CQje29+YEKNjbkQK+aLJZONQ4h1mUIkA29bOp+QuBzeYcjbBCLS1USd1vEtl4Eem3aE5A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1484; X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1484;20:zQgUUZPNUP26GI0aV++iL8kWefUY8Hx7S8yjs6xlLUPXS4xmjZUXj64EPoY6yKtceIwHxB5Ur/c8g4wAg3tDHPatL0+uRVukFadP+yJ+JcdB5ITwAPkw/kLgBZCU2xzGJC9WNSjnrOBI4BYWZMnoiLlUIFoCly/PkrZ6Cex6Uff+XDp9jcGyRpyyIDIXnsuvjYD9COFNLmUBwTZbcVs2wyfXOeDCB6phms/qUXDTKUd3XuX9O27+990IPMuqKZloTo5W2XNQGBjSjdRgQQrs6D+1Pg0Hi63aRAHt1YOukSJwuuUK8T3BAEjtB5jUAqMfoeY3tJX9dvMz2n2Tfx2Mt4WG91pXQq2K8fuhHOn/qwcdw7R/cPLwm/e/8fGNskfkz/X1+FgpE60D34XlkojiBmruizQxGtHjNGOTEoLLA6ywTO9wMTp/vlz96CWQcetkJwNcqjkF6U+WKrpd5LZczE1IhPKynDt3FzNxAOC0W+u5XHYppLa5H8QZh1baD1kj;4:SNyrJmL4trrlbcA4//UmIcGSks3KSFf3w7JVRADkYSom7hkMVVH2/ABic8xCItG0QkkgNwURJlb6cQ9/QuVJz6uqNRhMEF4y8F1c2fhK38+gofAl9lJGDx8+8OPj4AfnVY4AmCAKGtRFVGnEPMZuxaNxLZf7PfIf8dk1ciAWKdt/cJaGNHkW8GnFLfM74mT8cemQLcT7hI4nBHuPsa1gLW2jfIuyWxRFEQR046UO4TeltaecSVMuYSdJ4BEU8j2lwuo4khHQTU72cKromuRKvqoblPgN/UiSR4DlGFp5yJXV1nbQUg4Ipxs+5Bnpgwjf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(8121501046)(5005006)(3002001);SRVR:BY1PR03MB1484;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1484; X-Forefront-PRVS: 0685122203 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(199003)(189002)(68736005)(87976001)(105586002)(33656002)(5004730100002)(5001770100001)(122386002)(92566002)(69596002)(19580395003)(40100003)(189998001)(83506001)(97736004)(19580405001)(5001960100002)(4001350100001)(46102003)(77096005)(50986999)(106356001)(54356999)(97756001)(77156002)(46406003)(229853001)(4001540100001)(47776003)(5001830100001)(53416004)(62966003)(64706001)(101416001)(81156007)(86362001)(23726002)(5001860100001)(50466002)(42186005)(5007970100001)(3826002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR03MB1484;H:home.buserror.net;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR03MB1484;23:i1U8O0TTfyYPevSyUdMyBpqnd66Udcq/vCt42KmjA?= =?us-ascii?Q?6qvIOM9wrXNFnHMS5pT+G9wQ/OAVfuP2dnD4bdahRAURdF/kNBB34p39Yywl?= =?us-ascii?Q?lDuR8kLOZc6uvZDuq2tpAZOubEJxjNkGqNnJ3x0jhCr+qsvCLQltmpHBgVMa?= =?us-ascii?Q?zo+vfiWpHYnVg0NYBbgwcuXHANk5JCg010fffxv6QM5MUbQ6b0tTxVy23JRW?= =?us-ascii?Q?QLTt7phCokbtgDxDu0m7HsuTocClZ6IbTt18WBUiUy9yE1Y1UDJ5/Pd6U2JI?= =?us-ascii?Q?+iwQJEqf/zJvTAh8Ces41wFduX4428idVqepqKy2i7EXveIT/gYP/NYPzG5N?= =?us-ascii?Q?odUPRN/0wfg+G/h3LXZ+RGjF5NM3QSPsw/XTdHB1abQuolxTFF0XFH7JB82K?= =?us-ascii?Q?4vaNUY/Sa6ORyMKMmyKtXuIF8I7qajfnF/rjRqMWgu/WQHs3pvXHyFex0NSP?= =?us-ascii?Q?nsvtnY/ZN6hs4CVf5JNdZ2GTUhxHP7oOKl1yTiTMQaUsRrguo8oMKv5wib1K?= =?us-ascii?Q?SPhoDA9fU4igKmE2YdjoFRZjy6qbqvbGJULP6V388TIZ11kiKfaM8RJtt6kJ?= =?us-ascii?Q?wh5pHbji88dPMGNJTyOK6HJmR0DBMmv9AWYqjF1Z+DkFpG+XtGsZiEquFAUB?= =?us-ascii?Q?deWlMSgkl8D4VaBfmkRD6eibiWzi2mNxHJ3ytN7Gwsiu2aChrnfEHM9xLDX4?= =?us-ascii?Q?ZPm8u+1amAGcrmr8As+Vun2spoJRj1Bgo8NW3Z6dMwC/0Cx5wLgdB9ZJQNgv?= =?us-ascii?Q?zpi8LEUlFQ5G2cuWyhyNvJVN2D3iqrwe7HUv2yc4J1Iltzolp0rBFZQg8ibk?= =?us-ascii?Q?5xReNjDmhMAF9XR2yJd8xZTkaTXfzBrF6+Hd6Rp1NY3/r0BECRX8N0bX1NYV?= =?us-ascii?Q?IvpiRNVGlvOEQRCD8yQknQTQLpojzt2yG3AeNTrlCIcwXONoBCj92gG7tY3c?= =?us-ascii?Q?K8UrtR/H6rv+6cDaM7vO+jm+lHBr5KjBm6bFaW4WR+UAb3LzX7+fICjIvgDw?= =?us-ascii?Q?Uf37EhaU3wCvCh2BeTZiZHIt3ThJcUlrztl6gKeHb9lf37XXuRa/fKusB9t3?= =?us-ascii?Q?wesNzOrLJLguOmEz7N4FcF0uTLVi/4x35dO5bEvi4G7lp4/nMpMyt4cJtG7B?= =?us-ascii?Q?21gRooL8sGY9bhfheubMwgcHTSomGNwGywC8MmG3HCQapiv7kE+ZpnzazXG1?= =?us-ascii?Q?RDwWSNJZg82a/6qWNjI3aotxEhwDZjTul8D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1484;5:sLIOlf3SfbAplkxiDgV57VvojHvBOKo64xjlDtZUreh0oVzlwk/R5dph+3C0FbeVVWvw5GOhkbj+fZDFF7Tak2WdqrzNacjIjSG7GNcH0tlnBjI7sDNF8pNdEBDUsjM2VXP9eizfKBPLxtW+Zs9nYg==;24:nQKqS3WbJrhMZa3jBZQ5lLChYBAyUWLGQdnvrSH3ekUCbNPn14EtCy4fM6Yy9ut6dKi7veji2+St0g/koWoOIwqNIzp7yH9EaKqq5mjvbbI=;20:ik6i/lzvmUJt0DDZkCqCxiacuH+tOd7LgxbD+3MO/BxawBIVyF+m81l/igSAUHDNBZPBMmi2BJiJe48Gd5sKcA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2015 21:16:45.1164 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1484 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commits such as 65dd297ac25565 ("xfs: %pF is only for function pointers") caused a regression because pretty_print() didn't support %ps/%pS. The current %pf/%pF implementation in pretty_print() is what %ps/%pS is supposed to do, so use the same code for %ps/%pS. Addressing the incorrect %pf/%pF implementation is beyond the scope of this patch. Signed-off-by: Scott Wood --- tools/lib/traceevent/event-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index cc25f05..f05e5b0 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4761,8 +4761,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event else ls = 2; - if (*(ptr+1) == 'F' || - *(ptr+1) == 'f') { + if (*(ptr+1) == 'F' || *(ptr+1) == 'f' || + *(ptr+1) == 'S' || *(ptr+1) == 's') { ptr++; show_func = *ptr; } else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') { -- 2.1.4