From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f74.google.com (mail-oa1-f74.google.com [209.85.160.74]) (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 290BB21B1B9 for ; Tue, 1 Apr 2025 18:24:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531895; cv=none; b=grKm6+mCu66n3FiZvcTYf3rtnSc+1hA4eYY8z3ggZTFbo/v2ZParc/5PKArsEBQNybekaUz5v9VOOTULZw3qEUMrg/9T0BkiWNvkhR+JN0IjPZ1sQq+aPWanRbKDzmyh6+7m0JCerR+ELZB+1cLbhCPj4AOiI74rdpn8w/kmN6s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531895; c=relaxed/simple; bh=0P58XmLkpByBZvdI5TWdtrNeDfsj05v0r9rxb/JMquo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=OQ40fje2prviQLP9/eaXdeA5L0gbEqKkCJpmnW77iu19qoSa+L7kaGLcbGt5x2bT05ZpAXzCpt86qI5lZMVtsoth3+VGOYa1KXdsBZW0ES3PzQHeOvAkV6nnNySUMEFUOlLGkkGf+ZXLISdb6A7L7ljyFqqkWTUnMWGcVJUSvIg= 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=4t7tXp26; arc=none smtp.client-ip=209.85.160.74 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="4t7tXp26" Received: by mail-oa1-f74.google.com with SMTP id 586e51a60fabf-2c24c595a08so4162805fac.3 for ; Tue, 01 Apr 2025 11:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531891; x=1744136691; 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=J47yx8VBSVt15VBEKEnq1pVWwRSrja1JAZojE6DwMo8=; b=4t7tXp26nCl2aPUHAF0ASO5jS+ghE6ijLzoyYe/0Dke8adjMbo7dFRzzAPLciiyOcb jc3qN1V+5/WjKWBV1fwuTqYul4mawkU58f3pOADJyqFGnVB5yAXGFHCr8Dj3vqfYHxI3 CBlQ4XCrggE0GDI8XwsGrujZbnVqc4UCfn8jj4xCVCfxAuD8D74hDtN5VJqcQxjICFUr SZpNJSmHF02d6jV2fhPpkewvMYCs0+uKBRM5D2sC9rFb5yRoNnwnrYP6kb63aHpzdJ1k PbtLplyzg+rwRc4EaPk5UfW/6JsfHh/pR6qNTnP7xXRgl962A4E78p3rLEVnf2nrLwwo Wvjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531891; x=1744136691; 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=J47yx8VBSVt15VBEKEnq1pVWwRSrja1JAZojE6DwMo8=; b=csk6olpyYJt8d121vQG3aKe4WUj3PTUhe79V+Ei8m7JKQqPRIxLS5b6c5K27PY54ID TdchiQxFXMaRJaQP2zyEfjSXJoAkATik1xmblSQfL2pk4F4x8wZcr8vRyQSQ5g+aETHV AVzdTwFQIRGglHayiSyNnMAlrIBDpzIGidopYIy+hX2hOpCVPbv9S3DAySy3ANjySQii dnlY+ykfxekiIwhg60echDhOKvDqetp+Ouh8xTzYvfv3rOibV3ASZqYpvnZsYKVuAwCB sh18EA1/SRyPVnJjUSozs7GUUud5xfJQ2xTzlucvdgipPQ+fZc3NrY4REzwLq82SfK+T PPvA== X-Forwarded-Encrypted: i=1; AJvYcCVONctJTHWxgZ7fxlBozYE4Y5kLYjG0pefE8mKUSVsA3RJ+kT8+v8krOFj/wwVmKuGt43Sw@lists.linux.dev X-Gm-Message-State: AOJu0Yx17zU0+hfyFa3Skk0dkyPTLC23XR7oSFJzw2p720vo/IPwm7VF FIV48O9U3Q7B45tiW3pSJxBVM21jp7pVNNObGqXFhZjQI4pcjlmJg+tv56Su5NBWJCwlWiid92K X++d6cw== X-Google-Smtp-Source: AGHT+IFbktdPc4EqMVUHFkxbKhOxMWhYPSzPPMPttQJuIG02RbiHk4MphqSQaB7uAgigA6m1vE8+hZ5rQgVO X-Received: from oabwh31.prod.google.com ([2002:a05:6871:a69f:b0:2ba:b7af:e2be]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:6120:b0:2b6:16f7:6488 with SMTP id 586e51a60fabf-2cbcf7e0959mr8992443fac.34.1743531891042; Tue, 01 Apr 2025 11:24:51 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:05 -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-8-irogers@google.com> Subject: [PATCH v1 07/48] tools subcmd: 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. Move mput_char out of header file to its only use in help.c, while changing its argument types. Signed-off-by: Ian Rogers --- tools/lib/subcmd/help.c | 28 ++++++++++++++++------------ tools/lib/subcmd/help.h | 6 ------ tools/lib/subcmd/parse-options.c | 16 ++++++++-------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/tools/lib/subcmd/help.c b/tools/lib/subcmd/help.c index 8561b0f01a24..555b91ada0f9 100644 --- a/tools/lib/subcmd/help.c +++ b/tools/lib/subcmd/help.c @@ -125,13 +125,11 @@ static void get_term_dimensions(struct winsize *ws) ws->ws_col = 80; } -static void pretty_print_string_list(struct cmdnames *cmds, int longest) +static void pretty_print_string_list(struct cmdnames *cmds, size_t longest) { - int cols = 1, rows; - int space = longest + 1; /* min 1 SP between words */ + size_t cols = 1, rows, max_cols; + size_t space = longest + 1; /* min 1 SP between words */ struct winsize win; - int max_cols; - int i, j; get_term_dimensions(&win); max_cols = win.ws_col - 1; /* don't print *on* the edge */ @@ -140,12 +138,12 @@ static void pretty_print_string_list(struct cmdnames *cmds, int longest) cols = max_cols / space; rows = (cmds->cnt + cols - 1) / cols; - for (i = 0; i < rows; i++) { + for (size_t i = 0; i < rows; i++) { printf(" "); - for (j = 0; j < cols; j++) { - unsigned int n = j * rows + i; - unsigned int size = space; + for (size_t j = 0; j < cols; j++) { + size_t n = j * rows + i; + int size = (int)space; if (n >= cmds->cnt) break; @@ -180,7 +178,7 @@ static void list_commands_in_dir(struct cmdnames *cmds, const char *path, const char *prefix) { - int prefix_len; + size_t prefix_len; DIR *dir = opendir(path); struct dirent *de; char *buf = NULL; @@ -194,7 +192,7 @@ static void list_commands_in_dir(struct cmdnames *cmds, astrcatf(&buf, "%s/", path); while ((de = readdir(dir)) != NULL) { - int entlen; + size_t entlen; if (!strstarts(de->d_name, prefix)) continue; @@ -250,10 +248,16 @@ void load_command_list(const char *prefix, exclude_cmds(other_cmds, main_cmds); } +static void mput_char(char c, size_t num) +{ + while (num--) + putchar(c); +} + void list_commands(const char *title, struct cmdnames *main_cmds, struct cmdnames *other_cmds) { - unsigned int i, longest = 0; + size_t i, longest = 0; for (i = 0; i < main_cmds->cnt; i++) if (longest < main_cmds->names[i]->len) diff --git a/tools/lib/subcmd/help.h b/tools/lib/subcmd/help.h index 355c066c8d49..258b3a143cbc 100644 --- a/tools/lib/subcmd/help.h +++ b/tools/lib/subcmd/help.h @@ -14,12 +14,6 @@ struct cmdnames { } **names; }; -static inline void mput_char(char c, unsigned int num) -{ - while(num--) - putchar(c); -} - void load_command_list(const char *prefix, struct cmdnames *main_cmds, struct cmdnames *other_cmds); diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c index 555d617c1f50..add46b81a131 100644 --- a/tools/lib/subcmd/parse-options.c +++ b/tools/lib/subcmd/parse-options.c @@ -201,7 +201,7 @@ static int get_value(struct parse_opt_ctx_t *p, return 0; case OPTION_SET_UINT: - *(unsigned int *)opt->value = unset ? 0 : opt->defval; + *(unsigned int *)opt->value = unset ? 0 : (unsigned int)opt->defval; return 0; case OPTION_SET_PTR: @@ -256,12 +256,12 @@ static int get_value(struct parse_opt_ctx_t *p, return 0; } if (opt->flags & PARSE_OPT_OPTARG && !p->opt) { - *(int *)opt->value = opt->defval; + *(int *)opt->value = (int)opt->defval; return 0; } if (get_arg(p, opt, flags, &arg)) return -1; - *(int *)opt->value = strtol(arg, (char **)&s, 10); + *(int *)opt->value = (int)strtol(arg, (char **)&s, 10); if (*s) return opterror(opt, "expects a numerical value", flags); return 0; @@ -272,14 +272,14 @@ static int get_value(struct parse_opt_ctx_t *p, return 0; } if (opt->flags & PARSE_OPT_OPTARG && !p->opt) { - *(unsigned int *)opt->value = opt->defval; + *(unsigned int *)opt->value = (unsigned int)opt->defval; return 0; } if (get_arg(p, opt, flags, &arg)) return -1; if (arg[0] == '-') return opterror(opt, "expects an unsigned numerical value", flags); - *(unsigned int *)opt->value = strtol(arg, (char **)&s, 10); + *(unsigned int *)opt->value = (unsigned int)strtol(arg, (char **)&s, 10); if (*s) return opterror(opt, "expects a numerical value", flags); return 0; @@ -770,9 +770,9 @@ static void print_option_help(const struct option *opts, int full) break; } - if (pos <= USAGE_OPTS_WIDTH) - pad = USAGE_OPTS_WIDTH - pos; - else { + if (pos <= USAGE_OPTS_WIDTH) { + pad = (int)(USAGE_OPTS_WIDTH - pos); + } else { fputc('\n', stderr); pad = USAGE_OPTS_WIDTH; } -- 2.49.0.504.g3bcea36a83-goog