From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id E8B183A73A67 for ; Mon, 19 Dec 2022 09:04:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E8B183A73A67 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BJ8R21o003398 for ; Mon, 19 Dec 2022 09:04:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=s61Y09Fr2hY2Mwyo2zOSnYk5ILK4WwUpnam33YmCrB4=; b=yearxkOyvBPK9kB2zDHSgC/+VhT9HrB34LoFcOJjZHxix25daVJMG/zZaE23XQ7ZYqmI OFvMhYkJuW1QNIhfRziNHrh5sm5y/mKo5Zvhb9vUea+EKou3qD5FBm2kK8SugdEU5heb qGqXswreRKUGvjsarDOvhwj/JtZ85gf9bKQWZXdABRWDBBht8PW+pLFWFt2ilXlm1G+x 78Wu1R1/62fHdtipr4lcYd/o1tUegBUp3TBtFJqe66sjVPeT8a/m+o1QaA4cHXVeKQ7/ oxILoVabOc3qR1imcXiGpw4buWhl/Jd6Q7pKLnj/e1HwvRiZ0bdd2bAtDNAY89ynWwJE zw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3mh6tstcyp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 19 Dec 2022 09:04:01 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2BJ8562j006514 for ; Mon, 19 Dec 2022 09:04:00 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2176.outbound.protection.outlook.com [104.47.55.176]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3mh473g1td-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 19 Dec 2022 09:04:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=No5ODOyfEDE9JmNsqczjFy6x6Rv81705SoQB3ta4DLYcgPfbCG/Ya+leZ5BBE3023GzSyW1pb1fBMbxRew9pU373HYadkMLek4BQIscM+r5dji/cUqHZcfsK/l4WQePblDZ/a9V3UrPPOyXdMVnGkKDx3NXqorvzIlTDoItRysCws5nKa55xoeWfPb/+HelRgD8ugE+ybR6rPKi21TS59ZNu8cGJ+Y051wYR+KV9ONt8zAwMXw8vXkW2I5BVmVpye9flZU/8NOI2yaYqPlxYpKwRRVSD4In0prcd494lqcNPD96bywSYq2ZV3/IbCcLml5NuqFzJSJyKUYPx4pxymQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=s61Y09Fr2hY2Mwyo2zOSnYk5ILK4WwUpnam33YmCrB4=; b=VnOPIZgz6KBMddRyv5wn+7Bd21/bk38ba0UuWA3uRbMz9Azsu/0wINRF0lxTXs2Wf6s16DcnkS5GRkslbyCmUeB1u1eu7bLT2eV27vtSHRlY5ViVlnmgvF10QmzaygYmjekE1OTGPY0Q00e1yQukP/z8TjWAwsRFfnFJYoIL93KmWDE5pznOHy1/fNYGzc8MFosQdB0mdGZC0bwAYXpUozkMTS9qVRJqNljQGYdGncj8bXyNeVAGG7eHuXXYz3hL8+HmGKVwXdJDpKtor90S0FMgI+l32ficn85+ED24LCgF50DCiJIp7sdSepYC+ijFGPrfNFST9lANBxdNPpK2wA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s61Y09Fr2hY2Mwyo2zOSnYk5ILK4WwUpnam33YmCrB4=; b=w0+ArL7Riaw5C8uLGNoPrG15JhpHOJczp40+d89ryJoMVMSj8LUh+h5tFPr77x4hE7SnJNdqEuBXAO8dTXPkBoZSW5yDnsZK0Xg51C7k+0LIPPsi0f/T+B/e0pFHxd/2v6vXRkQvKFAVMbO1iFOnuP39YK9mk9xZsz7kkw+eoHA= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by CO6PR10MB5538.namprd10.prod.outlook.com (2603:10b6:303:135::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Mon, 19 Dec 2022 09:03:57 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::1665:9f7e:853b:d138]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::1665:9f7e:853b:d138%8]) with mapi id 15.20.5924.016; Mon, 19 Dec 2022 09:03:56 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH] gprofng: PR29646 Various warnings Date: Mon, 19 Dec 2022 01:03:46 -0800 Message-Id: <20221219090346.213013-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR08CA0057.namprd08.prod.outlook.com (2603:10b6:a03:117::34) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|CO6PR10MB5538:EE_ X-MS-Office365-Filtering-Correlation-Id: c4a93a0c-5cba-4ed6-ddf2-08dae19ff5b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SlO1IIlQlzlE801Dn3cAexGZdcQ/r9R/tRI8aQNKJYQyFT1Yh3MoAFx4fSl1SwizIAii7jXi5f6SA3/0PSKx7iPkDHhcevPu3OO/Bkn9Gq2c8Nezy1fsl5k5Y8J3K4zxMd8DGx/P1kau8AzQ3r19qovxbDCAn6eUnD8mrGYA2lYhrPryppXZAi2WleeCfrNstxSISIAslxK8FcPhuEpAEzsYXdLem/b5hPH5drQRfBZ2W9/j7AXxSFLuyrJy9xxwH6j+SwV2ZaCDRcQk0cap3n73fuPJ0TcZJguvVQFICr1VK8Bv5mSO/n2/HimPjHgEYvNeR2bHSxaz6jTslHM3IU9ZlQvAml/uXd/GBC1Ajb00gh/brhi/AN51fPjQf7uo29KbhzwM7sZPdm93f9w5aWkzosgCUSv6Lfnx8KJF0itX3Vik27SswxtTpLqU/CdZOpw1PUEUBm5fmtr9VdPDy0UI9AzFn/L6tr9HvmKzzMwv/8+p7Lwzyqry6wIeUhW8LqEWeZHA9R9s3ggi+VMQ226kefNwR0YYhysuIMFyibd5qNmOzG5BhoRuDyQX3JDuG4MiD+TrRA2CN0cylll/bO4PJJ1Ks/xqdwy2q2/GV1xu9mHQL40xXiq0u6kHUFSP9NMOFV1BDQlBR8Imhxm79Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA2PR10MB4636.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(346002)(376002)(366004)(136003)(396003)(451199015)(186003)(6512007)(2616005)(6916009)(6486002)(9686003)(478600001)(6506007)(36756003)(107886003)(26005)(6666004)(1076003)(86362001)(83380400001)(38100700002)(5660300002)(8936002)(2906002)(4001150100001)(66556008)(4326008)(316002)(66946007)(66476007)(8676002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?s/2rlE0yC0SFR1yya29L9iTkaNhIAIAVbkUsSJVzhn/0FiyCcGhIV041gT2c?= =?us-ascii?Q?y8Ppx4/E3xcLxKiNLxdtCC3y83LsgKmhOwYHJt3vSHQHaJmhQdv7vEFyto36?= =?us-ascii?Q?4MKo3R3ElfkiT79uZGBjFr5JSR0THwWVjvqGNYbxHw6+ynYyrlM60Pv7h7Zg?= =?us-ascii?Q?qh/aEuUbgMPGDdASyr0uBcuknCsQXpMTXSUStKqQyjVRLP6RaJEHJbhw/Y6C?= =?us-ascii?Q?zy6ULXHg9PVYUsCBgnuHjRXcvWa92tpUwQVNrizXyXvMfn2ve1w4Jpf0cWRl?= =?us-ascii?Q?TqDJJUAIVxpBB50u03nLY5poPClxwRFo0QYVJ5tKoO9ZZhk4av7MNMmqCyQC?= =?us-ascii?Q?Ban9UGvC4+eviHA3OFxZjo+8yZC2p5gwsHUMBjteIGWoTx3frINS0jtoWALC?= =?us-ascii?Q?iastrQYwkZIr553tG7znwRasD7YBT/UT+oEI6SvVLmW7jnXOmJ5WeEOzTUOm?= =?us-ascii?Q?KQSYkW3nQ1Jzd4yt0A1T0ulALIITVb8qvk7q+9obOHgub1KVK097ixxRzFH7?= =?us-ascii?Q?6JKbIVctAzWvE4MtZCZAlvflHZhgIc2f8aog9z0Qyvl1wj7Y7KHSMHhKaBlB?= =?us-ascii?Q?SSynbWhgU97yAOMDsvDyfyk0AZG2UfLjpsz4PbG8Zc+egCGBcUTeusFpHyru?= =?us-ascii?Q?8g8aj1I7TC3C2GnDdXqx9beHgglVvBmC/Qm/QaP8nbTEGMw/fiUKWdkhp9uD?= =?us-ascii?Q?d195VKONjBVDK0/fc425zBqCT2O92Q/W+TNvM+roWg62L24h6H2SPsEbjmi1?= =?us-ascii?Q?Yj873kyjXKLahUDji2e/13Wxv6aOHBOsq5LC77Vd1fBOZ4klIL9Iyf9p4dFc?= =?us-ascii?Q?al2nWDSxIa4hbrdjwIl1Xi1/ed77hB0EunQbioRT4xkJ8iGlDaU+YgHUO+rw?= =?us-ascii?Q?54DJNY5CXLOY66YaMCJfZ1YqOOqO9zabpcLudEvVJG45lH3Q5te2eweF85Ap?= =?us-ascii?Q?oVmn2NpYwBBGCWiEUZ7jbyNn3EvHNKuonhjvIX4adQ8cimpo14Je32ptUR7k?= =?us-ascii?Q?T/t3ne3UJWy7HAJnxcYwQG6PDXCb/vE3X9NgjMjGJAPSO+i1yiqZzTPVq0hI?= =?us-ascii?Q?5wV6/K6cnXDeQ+UmqfJacn2ToG1XQ0mIBHYXTsGKk4OLE7GojElrgykLVc20?= =?us-ascii?Q?IEvjrrTC1et9wJbWuxTOOTyz2skTiCAiGMKvpBJ0c7K0kEO/j2ZR8P17AH+t?= =?us-ascii?Q?Ep/qVN8AmT5dwXS96khKslxhHr0jRhCApZ6kfwb84QEb9+ugbCnsFNVl8aOM?= =?us-ascii?Q?PRxno72x2ax5yutxcX7RnHVFUrUBKjfPcYA5GMVo2fiUMzWxcHKjJ2krgP/k?= =?us-ascii?Q?mmVvHBDEP3NguwQqU16LO4FGPo/Hlp7XkD4AK/nI9rfokjemGdUUxuekcgS9?= =?us-ascii?Q?Bh1McHg+6nYFZHZpH9IcyF06V9iJal3CUr9zEV0iHoIdGvXQzGKjrREXdKj6?= =?us-ascii?Q?mQhdyjeAcsF0cAVl8LfNNHXGdWCx50biMIX7ZQEEX6JwifdIe6wYXB+D/1Ls?= =?us-ascii?Q?mVg31irXGIQXpnvdN/5SyT4PdYaU4Jj1ZJK5FHF3e6HkMGajiSt1liIKqQt8?= =?us-ascii?Q?g3PQp5H8Fy8NrHMG8rYsbMwWJJFWN9PXtnj4LX9hkLinsYsHqvvhWkErGv/2?= =?us-ascii?Q?lQ=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4a93a0c-5cba-4ed6-ddf2-08dae19ff5b4 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2022 09:03:56.6698 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xk26Lgu/nS8vh0rvp0/DkW3KjMqi3sRt8gmjJqmfNgrPYIUWEhK32F6nyqZ0lf27IyUarNNsfOAWN24Y4Aog19h4ELdgjhF1576SQ9Qq974= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5538 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-18_13,2022-12-15_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2212190079 X-Proofpoint-ORIG-GUID: PZQ7jpbuiTySX4VyComnzAu16J2-08kS X-Proofpoint-GUID: PZQ7jpbuiTySX4VyComnzAu16J2-08kS X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,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: Vladimir Mezentsev gprofng/ChangeLog 2022-12-19 Vladimir Mezentsev PR gprofng/29646 * common/core_pcbe.c: Fix missingReturn warning. * libcollector/iolib.c: Fix -Waddress warnings. * src/Settings.cc: Likewise. * src/checks.cc: Likewise. * libcollector/linetrace.c: Likewise. * libcollector/iotrace.c: Fix va_end_missing error. * libcollector/libcol_util.c: Fix uninitvar warning. * src/Command.cc: Fix arrayIndexOutOfBounds error. * src/Function.cc: Fix uninitStructMember warning. * src/ipc.cc: Fix -Wwrite-strings warnings. --- gprofng/common/core_pcbe.c | 2 ++ gprofng/libcollector/iolib.c | 2 +- gprofng/libcollector/iotrace.c | 7 ++++++- gprofng/libcollector/libcol_util.c | 2 +- gprofng/libcollector/linetrace.c | 2 +- gprofng/src/Command.cc | 2 +- gprofng/src/Function.cc | 2 ++ gprofng/src/Settings.cc | 2 +- gprofng/src/checks.cc | 2 +- gprofng/src/ipc.cc | 12 ++++++------ 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/gprofng/common/core_pcbe.c b/gprofng/common/core_pcbe.c index 6f746d8da1d..e10a14ea1e8 100644 --- a/gprofng/common/core_pcbe.c +++ b/gprofng/common/core_pcbe.c @@ -2937,6 +2937,8 @@ core_pcbe_cpuref (void) return GTXT ("See Chapter 19 of the \"Intel 64 and IA-32 Architectures Software Developer's Manual Volume 3B: System Programming Guide, Part 2\"\nOrder Number: 253669-045US, January 2013"); } +#else + return GTXT ("Unknown cpu model"); #endif } diff --git a/gprofng/libcollector/iolib.c b/gprofng/libcollector/iolib.c index 861843c183d..5f09b0e4cd1 100644 --- a/gprofng/libcollector/iolib.c +++ b/gprofng/libcollector/iolib.c @@ -148,7 +148,7 @@ __collector_create_handle (char *descp) init (); /* set up header for file, file name, etc. */ - if (__collector_exp_dir_name == NULL) + if (*__collector_exp_dir_name == 0) { __collector_log_write ("__collector_exp_dir_name==NULL\n", SP_JCMD_CERROR, COL_ERROR_EXPOPEN); diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c index e7e8afa307d..466bf457b75 100644 --- a/gprofng/libcollector/iotrace.c +++ b/gprofng/libcollector/iotrace.c @@ -2713,10 +2713,15 @@ fprintf (FILE *stream, const char *format, ...) if (NULL_PTR (vfprintf)) init_io_intf (); if (CHCK_REENTRANCE (guard) || stream == NULL) - return CALL_REAL (vfprintf)(stream, format, ap); + { + ret = CALL_REAL (vfprintf)(stream, format, ap); + va_end (ap); + return ret; + } PUSH_REENTRANCE (guard); hrtime_t reqt = gethrtime (); ret = CALL_REAL (vfprintf)(stream, format, ap); + va_end (ap); if (RECHCK_REENTRANCE (guard)) { POP_REENTRANCE (guard); diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c index d682aa0ab29..454f45bba00 100644 --- a/gprofng/libcollector/libcol_util.c +++ b/gprofng/libcollector/libcol_util.c @@ -137,7 +137,7 @@ atomic_swap (volatile int * p, int v) int __collector_mutex_lock (collector_mutex_t *lock_var) { - volatile unsigned int i; /* xxxx volatile may not be honored on amd64 -x04 */ + volatile unsigned int i = 0; /* xxxx volatile may not be honored on amd64 -x04 */ if (!(*lock_var) && !atomic_swap (lock_var, 1)) return 0; diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c index d67a66a3734..e974c97ec9b 100644 --- a/gprofng/libcollector/linetrace.c +++ b/gprofng/libcollector/linetrace.c @@ -832,7 +832,7 @@ linetrace_ext_fork_epilogue (const char *variant, const pid_t ret, char * n_line const char *params = CALL_UTIL (getenv)(SP_COLLECTOR_PARAMS); int ret; - if (new_exp_name == NULL) + if (*new_exp_name == 0) TprintfT (DBG_LT0, "linetrace_ext_fork_epilogue: ERROR: getenv(%s) undefined -- new expt aborted!\n", SP_COLLECTOR_EXPNAME); else if (params == NULL) diff --git a/gprofng/src/Command.cc b/gprofng/src/Command.cc index d1620d7acd6..40530c2d15d 100644 --- a/gprofng/src/Command.cc +++ b/gprofng/src/Command.cc @@ -222,7 +222,7 @@ static Cmdtable cmd_lst[] = { // list of commands // like quit, but deletes all data loaded { HHELP, "xhelp", NULL, NULL, 0, &desc[HHELP]}, - { WHOAMI, "-whoami", NULL, NULL, 0, &desc[WHOAMI]}, + { WHOAMI, "whoami", NULL, NULL, 0, NULL}, // these are not recognized at this point { LOADOBJECT, "segments", "pmap", NULL, 0, &desc[LOADOBJECT]}, diff --git a/gprofng/src/Function.cc b/gprofng/src/Function.cc index b0e4a8ff16a..0436e09ebea 100644 --- a/gprofng/src/Function.cc +++ b/gprofng/src/Function.cc @@ -416,6 +416,8 @@ SrcInfo * Function::new_srcInfo () { SrcInfo *t = new SrcInfo (); + t->src_line = NULL; + t->included_from = NULL; t->next = srcinfo_list; srcinfo_list = t; return t; diff --git a/gprofng/src/Settings.cc b/gprofng/src/Settings.cc index 572997f8a88..53405a20075 100644 --- a/gprofng/src/Settings.cc +++ b/gprofng/src/Settings.cc @@ -1257,7 +1257,7 @@ Settings::set_name_format (char *arg) return CMD_BAD_ARG; bool soname_fmt = false; - if (colon && (colon + 1)) + if (colon) { colon++; if (!strcasecmp (colon, NTXT ("soname"))) diff --git a/gprofng/src/checks.cc b/gprofng/src/checks.cc index 105821e4cfa..6a89a7b1cdb 100644 --- a/gprofng/src/checks.cc +++ b/gprofng/src/checks.cc @@ -326,7 +326,7 @@ collect::check_executable_arch (Elf *elf) // now figure out if the platform can run it struct utsname unbuf; int r = uname (&unbuf); - if (r == 0 && unbuf.machine && strstr (unbuf.machine, "_64") == NULL) + if (r == 0 && strstr (unbuf.machine, "_64") == NULL) // machine can not run 64 bits, but this code is 64-bit return EXEC_ELF_ARCH; } diff --git a/gprofng/src/ipc.cc b/gprofng/src/ipc.cc index 06ba33d5b69..180b5104e22 100644 --- a/gprofng/src/ipc.cc +++ b/gprofng/src/ipc.cc @@ -69,16 +69,16 @@ bool2str (bool v) return v ? "true" : "false"; } -inline char* -str2str (String v) +inline const char* +str2str (const char* v) { - return (char*) (v ? v : "NULL"); + return v ? v : "NULL"; } -inline char* -str2s (String v) +inline const char* +str2s (const char* v) { - return (char*) (v ? v : ""); + return v ? v : ""; } inline DbeView * -- 2.31.1