From patchwork Sun Apr 28 23:46:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Damianov X-Patchwork-Id: 89115 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 721493858C32 for ; Sun, 28 Apr 2024 23:48:10 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 3BDB13858D35 for ; Sun, 28 Apr 2024 23:47:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BDB13858D35 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3BDB13858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714348065; cv=none; b=tVy4kcrbkIs+WC1Y0Hp2fwr79tYmsL+HUR930EWpK2IUYK+0J/4iqN5Ta0oehDJC+wjg1LyigwSdh6AqtmxO0NADrMZID0sL+k8xplzw0guRdMJBu0LXW0l+hraex5noJfHTXk1zWnhuJOB5ZTfL8yUTej3NFRn1e1efibemdaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714348065; c=relaxed/simple; bh=0szsPW0zR+D0Xy+jE+c18zD57KcBLiOmbHcEzM9wTLs=; h=From:DKIM-Signature:To:Subject:Date:Message-Id:MIME-Version; b=lgLtchz8MduAwpr4M+NHtW05pN6NO72N8HXzR/JiBPSwA5pYLdF87OJAKL62YvMliCndbH7eem1cORbzZM7ppeeDshq6Mmi5E9aBKp3NX4hxNFp3337TcF68AfvL2WUcNSaBUyfNPNRsHibEXc3Ho2QT1kt9pQfpbbYaEJzWw/Y= ARC-Authentication-Results: i=1; server2.sourceware.org X-Virus-Scanned: SPAM Filter at disroot.org From: Peter Damianov DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1714348061; bh=0szsPW0zR+D0Xy+jE+c18zD57KcBLiOmbHcEzM9wTLs=; h=From:To:Cc:Subject:Date; b=Lk7mFsiuT5hRW25UYhCSS9lR8SA3rhOggKyrRsgjcBPpciUxD+A5oIf1V8GddON3u AGtpEXkfnAjENs0+lFlcze3bOh8LeZ4DXZ4mBSthRO78ZSd0XgCkFLTaxxdOfurGiC nBSsaMrQvIGzzIOqlVHdanZmzDXVbjMn7d4sEMVsjjWM1rRD3KBFNlXf8Kn9ew326h a2JXvns/Or+7loTSanMOqiRIEEsl1cbx7OCcZFL+ogVvpKxkijJ19yUMI/U92Qh/9J BtuzZEJWDXI3hHV67C39pn2kpxD9FuwuzIYH0G5ATWc7PynkQhm5l1Ozm/0np3GfQN 806OrjznXcR9w== To: gcc-patches@gcc.gnu.org Cc: Peter Damianov Subject: [PATCH] Silence two instances of -Wcalloc-transposed-args Date: Sun, 28 Apr 2024 16:46:19 -0700 Message-Id: <20240428234618.25964-1-peter0x44@disroot.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Signed-off-by: Peter Damianov --- Fixes these warnings: ../../gcc/gcc/../libgcc/libgcov-util.c: In function 'void tag_counters(unsigned int, int)': ../../gcc/gcc/../libgcc/libgcov-util.c:214:59: warning: 'void* calloc(size_t, size_t)' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 214 | k_ctrs[tag_ix].values = values = (gcov_type *) xcalloc (sizeof (gcov_type), | ^~~~~~~~~~~~~~~~~~ ../../gcc/gcc/../libgcc/libgcov-util.c:214:59: note: earlier argument should specify number of elements, later size of each element ../../gcc/gcc/../libgcc/libgcov-util.c: In function 'void topn_to_memory_representation(gcov_ctr_info*)': ../../gcc/gcc/../libgcc/libgcov-util.c:529:43: warning: 'void* calloc(size_t, size_t)' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 529 | = (struct gcov_kvp *)xcalloc (sizeof (struct gcov_kvp), n); | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../gcc/gcc/../libgcc/libgcov-util.c:529:43: note: earlier argument should specify number of elements, later size of each element I think this can be applied as obvious. libgcc/libgcov-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libgcc/libgcov-util.c b/libgcc/libgcov-util.c index ba4b90a480d..f443408c4ab 100644 --- a/libgcc/libgcov-util.c +++ b/libgcc/libgcov-util.c @@ -211,8 +211,8 @@ tag_counters (unsigned tag, int length) gcc_assert (k_ctrs[tag_ix].num == 0); k_ctrs[tag_ix].num = n_counts; - k_ctrs[tag_ix].values = values = (gcov_type *) xcalloc (sizeof (gcov_type), - n_counts); + k_ctrs[tag_ix].values = values = (gcov_type *) xcalloc (n_counts, + sizeof (gcov_type)); gcc_assert (values); if (length > 0) @@ -526,7 +526,7 @@ topn_to_memory_representation (struct gcov_ctr_info *info) if (n > 0) { struct gcov_kvp *tuples - = (struct gcov_kvp *)xcalloc (sizeof (struct gcov_kvp), n); + = (struct gcov_kvp *)xcalloc (n, sizeof (struct gcov_kvp)); for (unsigned i = 0; i < n - 1; i++) tuples[i].next = &tuples[i + 1]; for (unsigned i = 0; i < n; i++)