From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78F43215793 for ; Tue, 1 Apr 2025 18:24:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531890; cv=none; b=iiUGJchpJbfuZArgwt/EKjZdyJ+oHDau541Em0UlpdtEGEA7d8anZgypvizfRtyATkk557IeQ0R8K+Wh81FLiotkpM3K95qjSyojvIrr9iHQF6mOtq8y9F2590fmgems6cteiGWkOWbXfcHJkM6pow6UE6sv6t07FV5pYRZ8EwM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531890; c=relaxed/simple; bh=bs+hau3BfGPgjfML6AAaTQNI5hHZ1yXB3kHmZBCp/iY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Q/E1pSSacIH99LvFwd/9PiZokju81xJ6lEN2pCl6czNy+ocpb7LJgfEZEljaUSHhCoAieZ8mzQChgTpPUOBi/yq94OEXUHl0rtqGQAGzYPSke44x0lWT3UfbyMGuPHka7Sm5FeCyV/eN0wUr4chD9OlFSj0LCfLvqpcg6wzRtaY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=TLOEUtxW; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TLOEUtxW" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-224192ff68bso103801895ad.1 for ; Tue, 01 Apr 2025 11:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531887; x=1744136687; darn=lists.linux.dev; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Lwp5jWQnZd0R1nLl4eHrnW+r9QoCXnSEZWGom8Yr2/Q=; b=TLOEUtxWoVO84uMD21hBna+ljoMYSCfq90ruayNnzB2uYeq4bzHo/A0w2s7/sHwaa1 zkP8ZY0YeXO1Ss0MgkpBXwWPw5IaPvXHEpgrzJnuxKi+QrUV0G6yQ6pDCsZDv1ohr7TQ YUTqADupqo/2aK1bns8ZbrRE/27rV9AxGE3Fon/TSvermySOcFHpxsDH+mq+ZBRQ91Qi TVvoyG171u9y9KCQ8w3a9Ps2XTRB1gUpOZUtnciuQo6riX3icKkAKrVQwx4EvD3VV9D5 gC/PkTr7VbgU0kZnrTkk19xVDRmeHaZizqOjOaIP/37Fas33+mXMbCt3p9H3bDBMUL7H k0Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531887; x=1744136687; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Lwp5jWQnZd0R1nLl4eHrnW+r9QoCXnSEZWGom8Yr2/Q=; b=B/A6Fv2HsBngsVLHkVWpunRMN57MB/fabfQt/fSGvFlfJAKMDP+uykwvcEJ3eV5twM KNngV5D21SM/3Ux1I+NlPntAWjCjEHXfpe1qYKlhEM8n3hM9gPTc2U8eE2J0NlgKF8ku anuOi210dxAcYn6JeQkdwLp0m84Zq++LmJyEM21ofS0P8cObcJanZbgxsTnG4BaIex85 T37/GCjyXEXnIP1t/IDQdsUzNbR8TVLdoWxoDizgkreF+A/7uO3qc8yOiSy4TI0DEi0D tRH3uRbOghYp1SBXKoRnfAETCI/cCS8jBjxMm4fbSa2kesV2B+G+6q+yC0TVZceCbfGm 9V2Q== X-Forwarded-Encrypted: i=1; AJvYcCVrRZ1C1wGOj/kuCmzc8/44E9js0gsyQ/voFcGkyqQyAB5IUxrHHIkXy5MK1kxiovACCWuy@lists.linux.dev X-Gm-Message-State: AOJu0YyAki7uFCgUy7hxshiAidhtbXb5QCymVDKI/jIGB23vbUEG6Heu w+7UXI24RvMxAc6I5SU6c85KGuo7524LwoMsO6QTRKzO/r0MWcNM0TwV7P3eqQbSj7D2JJ1esu4 JXp/dGw== X-Google-Smtp-Source: AGHT+IFzLtYxGxyTxV1rkwdh9UBSEEBVvK00y1AbRI2exTnDGJCaOS8iSdXoMves7V2W+aK2MyJ5/OHSrlvi X-Received: from plbbh9.prod.google.com ([2002:a17:902:a989:b0:223:49f0:9077]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:d54f:b0:224:584:6f07 with SMTP id d9443c01a7336-2292f9e63damr210311785ad.37.1743531886714; Tue, 01 Apr 2025 11:24:46 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:03 -0700 In-Reply-To: <20250401182347.3422199-1-irogers@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250401182347.3422199-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250401182347.3422199-6-irogers@google.com> Subject: [PATCH v1 05/48] tools lib: Silence -Wshorten-64-to-32 warnings From: Ian Rogers To: Yury Norov , Rasmus Villemoes , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Thomas Gleixner , Darren Hart , Davidlohr Bueso , "=?UTF-8?q?Andr=C3=A9=20Almeida?=" , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Yicong Yang , Jonathan Cameron , Nathan Chancellor , Bill Wendling , Justin Stitt , Josh Poimboeuf , Al Viro , Kyle Meyer , Ben Gainey , Athira Rajeev , Kajol Jain , Aditya Gupta , Eder Zulian , Dapeng Mi , Kuan-Wei Chiu , He Zhe , Dirk Gouders , Brian Geffon , Ravi Bangoria , Howard Chu , Charlie Jenkins , Colin Ian King , Dominique Martinet , Jann Horn , Masahiro Yamada , Arnd Bergmann , Yang Jihong , Dmitry Vyukov , Andi Kleen , Graham Woodward , Ilkka Koskinen , Anshuman Khandual , Zhongqiu Han , Hao Ge , Tengda Wu , Gabriele Monaco , Chun-Tse Shao , Casey Chen , "Dr. David Alan Gilbert" , Li Huafei , "Steinar H. Gunderson" , Levi Yun , Weilin Wang , Thomas Falcon , Thomas Richter , Andrew Kreimer , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Christophe Leroy , Jean-Philippe Romain , Junhao He , "Masami Hiramatsu (Google)" , Xu Yang , Steve Clevenger , Zixian Cai , Stephen Brennan , Yujie Liu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" The clang warning -Wshorten-64-to-32 can be useful to catch inadvertent truncation. In some instances this truncation can lead to changing the sign of a result, for example, truncation to return an int to fit a sort routine. Silence the warning by making the implicit truncation explicit. Signed-off-by: Ian Rogers --- tools/lib/api/fs/fs.c | 4 ++-- tools/lib/bitmap.c | 2 +- tools/lib/string.c | 6 +++--- tools/lib/vsprintf.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c index edec23406dbc..2c4677901de9 100644 --- a/tools/lib/api/fs/fs.c +++ b/tools/lib/api/fs/fs.c @@ -349,7 +349,7 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep) { struct io io; char bf[128]; - int err; + ssize_t err; io.fd = open(filename, O_RDONLY); if (io.fd < 0) @@ -363,7 +363,7 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep) } else err = 0; close(io.fd); - return err; + return (int)err; } int filename__write_int(const char *filename, int value) diff --git a/tools/lib/bitmap.c b/tools/lib/bitmap.c index 2178862bb114..87bd15e3968e 100644 --- a/tools/lib/bitmap.c +++ b/tools/lib/bitmap.c @@ -32,7 +32,7 @@ size_t bitmap_scnprintf(unsigned long *bitmap, unsigned int nbits, char *buf, size_t size) { /* current bit is 'cur', most recently seen range is [rbot, rtop] */ - unsigned int cur, rbot, rtop; + size_t cur, rbot, rtop; bool first = true; size_t ret = 0; diff --git a/tools/lib/string.c b/tools/lib/string.c index 3126d2cff716..638e75b63538 100644 --- a/tools/lib/string.c +++ b/tools/lib/string.c @@ -182,7 +182,7 @@ char *strreplace(char *s, char old, char new) return s; } -static void *check_bytes8(const u8 *start, u8 value, unsigned int bytes) +static void *check_bytes8(const u8 *start, u8 value, size_t bytes) { while (bytes) { if (*start != value) @@ -206,7 +206,7 @@ void *memchr_inv(const void *start, int c, size_t bytes) { u8 value = c; u64 value64; - unsigned int words, prefix; + size_t words, prefix; if (bytes <= 16) return check_bytes8(start, value, bytes); @@ -216,7 +216,7 @@ void *memchr_inv(const void *start, int c, size_t bytes) value64 |= value64 << 16; value64 |= value64 << 32; - prefix = (unsigned long)start % 8; + prefix = (size_t)start % 8; if (prefix) { u8 *r; diff --git a/tools/lib/vsprintf.c b/tools/lib/vsprintf.c index 8780b4cdab21..62028a5eea7e 100644 --- a/tools/lib/vsprintf.c +++ b/tools/lib/vsprintf.c @@ -8,7 +8,7 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) int i = vsnprintf(buf, size, fmt, args); ssize_t ssize = size; - return (i >= ssize) ? (ssize - 1) : i; + return (i >= ssize) ? (int)(ssize - 1) : i; } int scnprintf(char * buf, size_t size, const char * fmt, ...) @@ -21,7 +21,7 @@ int scnprintf(char * buf, size_t size, const char * fmt, ...) i = vsnprintf(buf, size, fmt, args); va_end(args); - return (i >= ssize) ? (ssize - 1) : i; + return (i >= ssize) ? (int)(ssize - 1) : i; } int scnprintf_pad(char * buf, size_t size, const char * fmt, ...) @@ -40,5 +40,5 @@ int scnprintf_pad(char * buf, size_t size, const char * fmt, ...) buf[i] = 0x0; } - return (i >= ssize) ? (ssize - 1) : i; + return (i >= ssize) ? (int)(ssize - 1) : i; } -- 2.49.0.504.g3bcea36a83-goog