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 EAF153857717 for ; Tue, 10 Oct 2023 16:16:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EAF153857717 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 39AFwr3d029909 for ; Tue, 10 Oct 2023 16:16:54 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-2023-03-30; bh=7rtgjSDFOaLYI/sMPCawOyeS5TaY0DpKo3QCMU+Xm6o=; b=YeF+HugNzb4iuH6Nz4bp2KNSZKhnN2a5mUnQ8lRMgAnCZ2pfrEYus3koJFIK6HAuvdon eWYAi8QFs/ZKt/t9TM8sRTqqZspHXq7bHrdj0gAhIuNxv2UBCC/h8uMD0RcfQzk8UbyI +kbDxF19FbDSAOc5WG+QpdeSaJ46i0JEVPfd9UxuWEBCHlfMZYwHkgMFDt1CiHkNgnQN KPKkUZWjtX5HSD3/J50wm6oBsrnitYTz07cx3Bw4VDW0492m3SZPa009RMWwmg0XEckX rcyJ0dAgY8i87WFQxJgEASV1gcH7fEvYISUWt7DPW2DSi+K+7RDXZvk9lXyQtK9tDaF5 8Q== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tjycdnkrs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 10 Oct 2023 16:16:54 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 39AG1nkR004727 for ; Tue, 10 Oct 2023 16:16:53 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2168.outbound.protection.outlook.com [104.47.73.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3tjws6vpp0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 10 Oct 2023 16:16:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cNyCxGrXgwsGFqI4Vjfq2nBuoW0pYbcfulUdfTdNjd+1+2L8XtfKvLd38lJwostYZDr4nJfw3KBFYPiQ+jIpYtaNB25iI++77RwVPtMDq8K6db2MgPhgj7YQoq0PnX2fxhuVRl6NK0gbV7ch/Huv5R094MvnR0pzs7vqrUGubGjHvVhIRJzAucI3yptK7JDHLpXVbUJ0Pl3peKh+YUQkYMtNkk15U7v+EvVszXRT9Efa/s8L6wXRHavW//DAoVfci+aCW3nu3tJTfnTXFv2V4lqvUdcIH1JrAwYUN0NdGp2EXPI5/7LTT14lqOumhJ6HCrBgVXqlNfxz8LmS17/Xag== 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=7rtgjSDFOaLYI/sMPCawOyeS5TaY0DpKo3QCMU+Xm6o=; b=K90di82i47bqTaSBG/fP9HyV2nVlpIrqm+i+uHlIRz+ch56jroDbozOn1lE5spFTExIe9YtBR1pXtCjUiByQROHDejj0F4UbPGHFLgSnRmBlZtuo05XjPArKiXRvSXjMS0mWzec7a9nJuAN66gp4Gd3fxoA2vpCp3NsRtF2TmuZAGvA35P1jcN3G2ekLHZOi7uVAyHxA+jcJmXRflsKkytGYNBIShsy0fiX79SS0OzsTmOlq6qahgLuM44GJRaYR+5H6+tqRxYx7Of+I7ijgkGi0MrIdtxsma5OSUa8BUlHC+4hOe3TuuXGVyAzYPlW/5gTiUWZLKBuip3DwLSozrA== 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=7rtgjSDFOaLYI/sMPCawOyeS5TaY0DpKo3QCMU+Xm6o=; b=hCV0+nam6fW+1ovCmDHD7O+0Q8ZiF+1Lt+/Ueav6iYxhYhoIwb9H6z86U/a3d9/hLuSXYp/Aq2ZUCNPpv5ajSHKkn1a6VdnUq/faR3U7hI7V3ouxibUo8NeVE4ajx8uJtOZEvdy27VMKbOGcqUyBz1lf3U+ym84j7eiw2oS6fWk= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by CH3PR10MB6787.namprd10.prod.outlook.com (2603:10b6:610:14c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Tue, 10 Oct 2023 16:16:50 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::10b3:cd52:5c1e:146e]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::10b3:cd52:5c1e:146e%7]) with mapi id 15.20.6863.032; Tue, 10 Oct 2023 16:16:50 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH] gprofng: Use the correct application name in error messages Date: Tue, 10 Oct 2023 09:10:57 -0700 Message-Id: <20231010161057.3268944-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SJ2PR07CA0008.namprd07.prod.outlook.com (2603:10b6:a03:505::8) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|CH3PR10MB6787:EE_ X-MS-Office365-Filtering-Correlation-Id: 3812f43d-b167-4e6d-7649-08dbc9ac4f1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ChBAW62vDTIgWVfUtx76QfMYrAVHDLdhjvZJDUbKU8m+G3O/na9f9sVxnpMiumMCe9WxTLAPQITTOm+mFriF7vmP1NMxyoVcxvWjGPSgxgTesBMhrGi+QpEmjdAms8m5wc6lhK4ePxPd3V0B6W+8ZD4O4bmwC3FPhB6KL+k+AnXES9jzIOFS5S9LF4JzQMeOs2Qp14Y/kRv8vQSR6iCi+WRoOa54VWqpbjaHuWJhmzBtwkBA2Ug6XL5bh9u5O5fnALMctlQ6jknZAhLH65Wu/qmHCNWMfKsXYt42h+50ZvMThM9PGokK6Xa5is+sf7o/F4Wrf8aIhnXuB4AdkgIALfY6TBTond27Aa13Lm5lBeNhHzuBLXkn6V4TEgZtPa44eMon2rNLBp/SZt3QQMZP8qP6SepktgLEM+HagAvOHW9BmVwyqQHhnDBqPflBKh8uuoA33MOSywX7Cfqpv8Hyqj3M/oLXVrIy09+lqBZk27hcVvJSx8O0njpR12sxsez+A3XJ4xd/PgbWbq5xdkRjQOKThwbWlgEaom2rFfbbgd9QLUthTpGLJSnXbJGkAnU1 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:(13230031)(136003)(366004)(396003)(39860400002)(346002)(376002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(1076003)(2616005)(5660300002)(6486002)(478600001)(36756003)(6506007)(6512007)(9686003)(86362001)(41300700001)(38100700002)(66556008)(66946007)(66476007)(6916009)(316002)(30864003)(8676002)(2906002)(8936002)(4326008)(15650500001)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/7F9VMHsZTIQmIe9XlUf5URkhrm/AjkexkGv87a+iiaEYpYQ8Qzs0gLBorwR?= =?us-ascii?Q?mVngUgTCWvwwheYXLcVB1WXZpmqEG1gzQh3+guRUSdEngz5ddAHxsWsONsUl?= =?us-ascii?Q?1L36au2AYmobGx9MWDXKv2Nn+CXg/km/bT1OnNXPBdKWoFo+GvoMEIaFQTPl?= =?us-ascii?Q?8CIPr7vuNWXbr7st4ieyu9SPosrBhOcWErr2fXWeTo/ttEhqQFUOjpG0E9mm?= =?us-ascii?Q?mI0I1PyI4n2igNWGaN+oSTb6xw873ywl7AcZQgzFrqjjAST4YdHm0ug8GOI4?= =?us-ascii?Q?dAFpOtyglGhgJXtT86P3W3cK+Oy9mZw/zMit18A4+wms3o9EUzCejbp/gJeb?= =?us-ascii?Q?oxyCeYNi+SlY9FveUabyDqFKpml6redQSjfav0M7xjgdaRDAsnDgvtiREq3w?= =?us-ascii?Q?1ezwE5Ylap9YYd0x1XOFAZUWTOaCB39UmxPFA4Nm2tqxlEVChqop++cpIQJW?= =?us-ascii?Q?AOb4fb6bqv2feYprswZ1iDFfZxTqtDQalW6XjC1D5SnW3/XzMfNqPK866poq?= =?us-ascii?Q?nmGpngQbtXgvQM7CFC19SIEKwQMuQlblnhADzG4wpnyv+OsjOyWNl6yM1f0w?= =?us-ascii?Q?h59aRVdj3VjTyVr8kHlUY97qordU7LZPPKPaBb0h3+cHnSKM8aD17CAgSuPm?= =?us-ascii?Q?Q6RtqYoL+9qDTrabXZgO0rWZ+TmKSWDNFSU9DyCTahjhZUxtgbcDGq1xE25A?= =?us-ascii?Q?cv+sKCpFVGfvia35sAvt1/OzXMGha8T2uObSjdwXbzpvvpnFD6CkHRHcFcjb?= =?us-ascii?Q?WJJrcBhBjkW4BqvnLlmRE6WahEiwk+o5PjPkScQT3gygd21Dzb9YWLs/Q5Nj?= =?us-ascii?Q?ByAGY1sNuZEoCg8IRng5CeojfYUiyncN1XBHnN8FXMiW9ttFI+HKixlyX+Jg?= =?us-ascii?Q?xH5ESx/BogLIHC9YHbeH2Srf+ON7p8XhN+BoHYgQuTpFgWj0FQJpb4SZ9Vq1?= =?us-ascii?Q?NahpFj0f4MLsPs/hBXVcbEkP90N5UGnoy9V7Utn+t/GmkKZV1J7nJTkZNcgF?= =?us-ascii?Q?3kxYx1yJ9taLyLpDrNKPW84+6zWBrn6wbeYCUDV94U+/SGhZBi1+ndrFHFoo?= =?us-ascii?Q?Y3hRibBOrIN+o//SIf50+C8qn2Ve3FBrQrak+0+FBcJNX2jVm5QDkxYAkj56?= =?us-ascii?Q?k1JjByp0skcZc0KwKHtBSg71ORY0jX2+aNMQi9Bxl5AsFCApbJamhU8MvoDr?= =?us-ascii?Q?R/brgry8ZZHC+fpbT9N7SKqeehcZY74kEDu1JQXgh4nIsbL0bxOGYwPDdiYI?= =?us-ascii?Q?6fl2Q+xDd+VqxjQe3sdOch2rVIV6D5ztaK2aI75bkl5hNkYPdtVSNcir1RJR?= =?us-ascii?Q?UAYKLo0/9/G6GRZaMjR2FhRf74MtKQ2sTW1MYSdaHO3vxoplrGYlethkzy1T?= =?us-ascii?Q?8HgHv96XUxxbw0aAf8HfAHXaj7i/51bCkHt7HW49MEnWbOjuGtSLijm9hFjG?= =?us-ascii?Q?n+j4Cnju4ddrvqE+GI+KYnZVKnQvIBNWPGvjJce2bq5LA5337FsadrJM/fD5?= =?us-ascii?Q?gWH9GjcMI6yuwYoBQLRB61PuPl6MLveTyfX1qGW71Rq5+up4Kd1hN/fcQFph?= =?us-ascii?Q?cNwnR7wlXZNussTf7+kGudyoSmK4ZcS+7y8HAQV9I7sziPqnH3Rrb/BMcxya?= =?us-ascii?Q?w9/gNA4RBQyvy2+gup1Scz4=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ouZdn+Xv35ZAdfwR8D51mhs2jWzOxA9zfYMYCu9NGUN+PGoHU5qChTsTZju0R/TLFrA6rh0Jpy9m46uv462dWSIzUwY3nD34MUgnAYlXkFg5XsboOImfE1B6w5gOGZM+PqHxOHUVHKB1s0DurgLT3zVqNNtKXTGDW3lkMfivPxQ47rPKSZ3LuwDRq0DBfEHc4OhLYdmGw8S3+jsOKemAEZX55RF/A5ljM/maRGdsiVsCFMFymbML19HnahA+cf01LunyWuWGPAYX4/IkOhHboxSWb9dqNGiHMAEYf1/+TzD+hd/8/vsmkez/EngYTDpLAdwJZQXXj9kKSLMLnfemKBJzI/9jODKeoWGUGErl8hSdotO0uHxw6FMk27iNj1vprcIhLuctdy6YAhf82rNa3LSsxHUFpPKk7t31v2hPJJ5bmQ0bwp0nDXjOoqB7HyOejBRI1T2n2Y9GFYWQmGkes/oZiiHMUG0yO1KHYbmk5jjnSQBm6Hyg11+UIScytYBztjZSQrPcRP0s8qmUXy7oNdTIPFd3qwedTGBB7gScHxeKxaJ5HXKWWqsVEgnRHegtiblcnJfY5ITPAnRxazptC1c8ildvBIJMUe0S3zpXVIpzYAY4qnmGskaNS/uaZaqgafLtr8PPcQ9oD2H6Axo7zMImo4bqtUSR7Ogw2z8VBeh8xQHB4PoEiI1/nF2Xpf2WiP0xqoILQi75V25OhhyDNTaahSd9Omn7EoXjlZUU0WnQ6k08QqJFKjk2gme5bSQs3VKjxJxs3P6aGPT6F7XUyg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3812f43d-b167-4e6d-7649-08dbc9ac4f1b X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2023 16:16:50.3541 (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: FrvG09BF4EpVZ/WO7eG4nk1ZJ4YegZruBU9i3OvO539Q+iq7iVlhUAEmd5tFnzjvZNG5avyU61Eo0Mk/GfLoa8RqqKrKSfaaNCE1I0k6NFs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6787 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-10_12,2023-10-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310100121 X-Proofpoint-ORIG-GUID: f5X0WlVKjqtHEIF5qJw8vkZoZYMYNvas X-Proofpoint-GUID: f5X0WlVKjqtHEIF5qJw8vkZoZYMYNvas X-Spam-Status: No, score=-12.7 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_H5,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: Vladimir Mezentsev The old application name (er_archive) is used in many places. gprofng/ChangeLog 2023-10-09 Vladimir Mezentsev * src/Experiment.cc: Replace er_archive with gp-archive. * src/Experiment.cc: Likewise. --- gprofng/src/Experiment.cc | 54 +++++++++++++++++++-------------------- gprofng/src/gp-archive.cc | 25 +++++++++--------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc index cb54fe60fc3..1378ad5ce07 100644 --- a/gprofng/src/Experiment.cc +++ b/gprofng/src/Experiment.cc @@ -662,7 +662,7 @@ Experiment::ExperimentHandler::startElement (char*, char*, char *qName, Attribut else if (strcmp (str, SP_JCMD_ARCHIVE) == 0) { StringBuilder sb; - sb.sprintf (GTXT ("er_archive run: XXXXXXX")); + sb.sprintf (GTXT ("gp-archive run: XXXXXXX")); exp->pprocq->append (new Emsg (CMSG_WARN, sb)); } else if (strcmp (str, SP_JCMD_SAMPLE) == 0) @@ -6471,14 +6471,14 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ { if (errno == EEXIST) return 0; - fprintf (stderr, GTXT ("er_archive: unable to copy `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: unable to copy `%s': %s\n"), name, STR (strerror (errno))); return 1; } if (dbe_stat_file (name, NULL) != 0) { - fprintf (stderr, GTXT ("er_archive: cannot access file `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: cannot access file `%s': %s\n"), name, STR (strerror (errno))); close (fd_w); return 1; @@ -6487,7 +6487,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ int fd_r = ::open64 (name, O_RDONLY); if (fd_r == -1) { - fprintf (stderr, GTXT ("er_archive: unable to open `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: unable to open `%s': %s\n"), name, strerror (errno)); close (fd_w); unlink (aname); @@ -6507,7 +6507,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ n1 = (int) write (fd_w, buf, n); if (n != n1) { - fprintf (stderr, GTXT ("er_archive: unable to write %d bytes to `%s': %s\n"), + fprintf (stderr, GTXT ("gp-archive: unable to write %d bytes to `%s': %s\n"), n, aname, STR (strerror (errno))); do_unlink = true; break; @@ -6527,7 +6527,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_ if (do_unlink) { if (!hide_msg) - fprintf (stderr, GTXT ("er_archive: remove %s\n"), aname); + fprintf (stderr, GTXT ("gp-archive: remove %s\n"), aname); unlink (aname); return 1; } @@ -6556,11 +6556,11 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, if (!name || !aname || !common_archive) { if (!name) - fprintf (stderr, GTXT ("er_archive: Internal error: file name is NULL\n")); + fprintf (stderr, GTXT ("gp-archive: Internal error: file name is NULL\n")); if (!aname) - fprintf (stderr, GTXT ("er_archive: Internal error: file name in archive is NULL\n")); + fprintf (stderr, GTXT ("gp-archive: Internal error: file name in archive is NULL\n")); if (!common_archive) - fprintf (stderr, GTXT ("er_archive: Internal error: path to common archive is NULL\n")); + fprintf (stderr, GTXT ("gp-archive: Internal error: path to common archive is NULL\n")); return 1; } // Check if file is already archived @@ -6574,19 +6574,19 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, long size = pathconf (NTXT ("."), _PC_PATH_MAX); if (size < 0) { - fprintf (stderr, GTXT ("er_archive: Fatal error: pathconf(\".\", _PC_PATH_MAX) failed\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(\".\", _PC_PATH_MAX) failed\n")); return 1; } char *buf = (char *) malloc ((size_t) size); if (buf == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } char *ptr = getcwd (buf, (size_t) size); if (ptr == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: cannot determine current directory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot determine current directory\n")); free (buf); return 1; } @@ -6614,12 +6614,12 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, free (abs_aname); if (NULL != errmsg) { - fprintf (stderr, GTXT ("er_archive: Fatal error: %s\n"), errmsg); + fprintf (stderr, GTXT ("gp-archive: Fatal error: %s\n"), errmsg); free (errmsg); return 1; } fprintf (stderr, - GTXT ("er_archive: Fatal error: get_cksum(%s) returned %d\n"), + GTXT ("gp-archive: Fatal error: get_cksum(%s) returned %d\n"), name, crcval); return 1; } @@ -6631,7 +6631,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, free (cad); free (abs_aname); fprintf (stderr, - GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } // Check if full name is not too long @@ -6639,7 +6639,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, long max = pathconf (cad, _PC_PATH_MAX); if ((max < 0) || (len <= 0)) { // unknown error - fprintf (stderr, GTXT ("er_archive: Fatal error: pathconf(%s, _PC_PATH_MAX) failed\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(%s, _PC_PATH_MAX) failed\n"), cad); free (abs_caname); free (cad); @@ -6654,7 +6654,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, // Yes, we can do it abs_caname[max - 1] = 0; if (!hide_msg) - fprintf (stderr, GTXT ("er_archive: file path is too long - truncated:%s\n"), + fprintf (stderr, GTXT ("gp-gp-archive: file path is too long - truncated:%s\n"), abs_caname); } } @@ -6664,7 +6664,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, max = pathconf (cad, _PC_NAME_MAX); if ((max < 0) || (len <= 0)) { // unknown error - fprintf (stderr, GTXT ("er_archive: Fatal error: pathconf(%s, _PC_NAME_MAX) failed\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(%s, _PC_NAME_MAX) failed\n"), cad); free (abs_caname); free (cad); @@ -6679,7 +6679,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, // Yes, we can do it cafname[max - 1] = 0; if (!hide_msg) - fprintf (stderr, GTXT ("er_archive: file name is too long - truncated:%s\n"), + fprintf (stderr, GTXT ("gp-archive: file name is too long - truncated:%s\n"), abs_caname); } } @@ -6694,7 +6694,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, res = copy_file_to_archive (name, t, hide_msg); // hide messages if (res != 0) { - fprintf (stderr, GTXT ("er_archive: Fatal error: cannot copy file %s to temporary file: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot copy file %s to temporary file: %s\n"), name, t); unlink (t); free (t); @@ -6717,7 +6717,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, { if (errno != EEXIST) { - fprintf (stderr, GTXT ("er_archive: Fatal error: rename(%s, %s) returned error: %d\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: rename(%s, %s) returned error: %d\n"), t, abs_caname, res); unlink (t); free (t); @@ -6741,7 +6741,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, char *rel_caname = dbe_sprintf ("%s/%s", common_archive, cafname); if (rel_caname == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } lname = get_relative_link (rel_caname, aname); @@ -6751,7 +6751,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, { if (abs_aname == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } lname = get_relative_link (abs_caname, abs_aname); @@ -6762,7 +6762,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, free (abs_aname); if (lname == NULL) { - fprintf (stderr, GTXT ("er_archive: Fatal error: unable to allocate memory\n")); + fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); return 1; } // Create symbolic link: aname -> lname @@ -6771,7 +6771,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, res = symlink (lname, aname); if (res != 0) { - fprintf (stderr, GTXT ("er_archive: Fatal error: symlink(%s, %s) returned error: %d (errno=%s)\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: symlink(%s, %s) returned error: %d (errno=%s)\n"), lname, aname, res, strerror (errno)); free (abs_caname); free (lname); @@ -6783,7 +6783,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname, } else { - fprintf (stderr, GTXT ("er_archive: Internal error: file does not exist in common archive: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Internal error: file does not exist in common archive: %s\n"), abs_caname); res = 1; } @@ -6809,7 +6809,7 @@ Experiment::copy_file (char *name, char *aname, int hide_msg, char *common_archi common_archive, relative_path)) return 0; // Error. For now - fatal error. Message is already printed. - fprintf (stderr, GTXT ("er_archive: Fatal error: cannot copy file %s to common archive %s\n"), + fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot copy file %s to common archive %s\n"), name, common_archive); return 1; } diff --git a/gprofng/src/gp-archive.cc b/gprofng/src/gp-archive.cc index 89e3da8c0bd..af6065650c1 100644 --- a/gprofng/src/gp-archive.cc +++ b/gprofng/src/gp-archive.cc @@ -278,7 +278,7 @@ er_archive::start (int argc, char *argv[]) if (founder_exp->get_status () == Experiment::FAILURE) { if (!quiet) - fprintf (stderr, GTXT ("er_archive: %s: %s\n"), argv[last], + fprintf (stderr, GTXT ("gp-archive: %s: %s\n"), argv[last], pr_mesgs (founder_exp->fetch_errors (), NTXT (""), NTXT (""))); exit (1); } @@ -315,8 +315,8 @@ er_archive::start (int argc, char *argv[]) if (exp->get_status () == Experiment::FAILURE) { if (!quiet) - fprintf (stderr, GTXT ("er_archive: %s: %s\n"), exp_path, - pr_mesgs (exp->fetch_errors (), NTXT (""), NTXT (""))); + fprintf (stderr, GTXT ("gp-archive: %s: %s\n"), exp_path, + pr_mesgs (exp->fetch_errors (), "", "")); delete exp; continue; } @@ -362,7 +362,7 @@ er_archive::start (int argc, char *argv[]) if (elf && (lo->checksum != 0) && (lo->checksum != elf->elf_checksum ())) { if (!quiet) - fprintf (stderr, GTXT ("er_archive: '%s' has an unexpected checksum value; perhaps it was rebuilt. File ignored\n"), + fprintf (stderr, GTXT ("gp-archive: '%s' has an unexpected checksum value; perhaps it was rebuilt. File ignored\n"), df->get_location ()); continue; } @@ -480,12 +480,13 @@ er_archive::start (int argc, char *argv[]) for (long i = 0, sz = notfound_files->size (); i < sz; i++) { DbeFile *df = notfound_files->get (i); - fprintf (stderr, GTXT ("er_archive: Cannot find file: `%s'\n"), df->get_name ()); + fprintf (stderr, GTXT ("gp-archive: Cannot find file: `%s'\n"), df->get_name ()); } - fprintf (stderr, GTXT ("\n If you know the correct location of the missing file(s)" - " you can help %s to find them by manually editing the .gprofng.rc file." - " See %s man pages for more details.\n"), - whoami, whoami); + fprintf (stderr, + GTXT ("\n If you know the correct location of the missing file(s)" + " you can help gp-archive to find them by manually editing" + " the .gprofng.rc file." + " See the gp-archive man page for more details.\n")); } delete notfound_files; } @@ -588,21 +589,21 @@ er_archive::check_args (int argc, char *argv[]) int fd = open (optarg, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd == -1) { - fprintf (stderr, GTXT ("er_archive: Can't open %s: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Can't open %s: %s\n"), optarg, strerror (errno)); break; } if (dup2 (fd, 2) == -1) { close (fd); - fprintf (stderr, GTXT ("er_archive: Can't divert stderr: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Can't divert stderr: %s\n"), strerror (errno)); break; } if (dup2 (fd, 1) == -1) { close (fd); - fprintf (stderr, GTXT ("er_archive: Can't divert stdout: %s\n"), + fprintf (stderr, GTXT ("gp-archive: Can't divert stdout: %s\n"), strerror (errno)); break; } -- 2.31.1