[PATCH v1 27/48] perf probe: Silence -Wshorten-64-to-32 warnings

Ian Rogers
2025-04-01T18:25:31Z

tools/perf/util/probe-event.c | 9 +++++----
tools/perf/util/probe-file.c | 12 +++++++-----
2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 307ad6242a4e..a733dc59c3ca 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1336,7 +1336,7 @@ static int parse_line_num(char **ptr, int *val, const char *what)
const char *start = *ptr;

errno = 0;
- *val = strtol(*ptr, ptr, 0);
+ *val = (int)strtol(*ptr, ptr, 0);
if (errno || *ptr == start) {
semantic_error("'%s' is not a valid number.\n", what);
return -EINVAL;
@@ -1620,7 +1620,7 @@ static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
}
switch (c) {
case ':': /* Line number */
- pp->line = strtoul(arg, &tmp, 0);
+ pp->line = (int)strtoul(arg, &tmp, 0);
if (*tmp != '\0') {
semantic_error("There is non-digit char"
" in line number.\n");
@@ -2066,7 +2066,7 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp)
{
struct strbuf buf;
char *tmp, *ret = NULL;
- int len, err = 0;
+ int err = 0;

if (strbuf_init(&buf, 64) < 0)
return NULL;
@@ -2084,8 +2084,9 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp)
goto out;
}
if (pp->file) {
+ size_t len = strlen(tmp);
+
tmp = pp->file;
- len = strlen(tmp);
if (len > 30) {
tmp = strchr(pp->file + len - 30, '/');
tmp = tmp ? tmp + 1 : pp->file + len - 30;
diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c
index ec8ac242fedb..2d84002710f3 100644
--- a/tools/perf/util/probe-file.c
+++ b/tools/perf/util/probe-file.c
@@ -167,7 +167,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag)
/* Get raw string list of current kprobe_events or uprobe_events */
struct strlist *probe_file__get_rawlist(int fd)
{
- int ret, idx, fddup;
+ int ret, fddup;
FILE *fp;
char buf[MAX_CMDLEN];
char *p;
@@ -189,6 +189,8 @@ struct strlist *probe_file__get_rawlist(int fd)
goto out_close_fddup;

while (!feof(fp)) {
+ size_t idx;
+
p = fgets(buf, MAX_CMDLEN, fp);
if (!p)
break;
@@ -307,7 +309,7 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)
*p = '/';

pr_debug("Writing event: %s\n", buf);
- ret = write(fd, buf, strlen(buf));
+ ret = (int)write(fd, buf, strlen(buf));
if (ret < 0) {
ret = -errno;
goto error;
@@ -962,7 +964,7 @@ static int probe_cache_entry__write(struct probe_cache_entry *entry, int fd)
iov[0].iov_base = (void *)prefix; iov[0].iov_len = 1;
iov[1].iov_base = entry->spev; iov[1].iov_len = strlen(entry->spev);
iov[2].iov_base = (void *)"\n"; iov[2].iov_len = 1;
- ret = writev(fd, iov, 3);
+ ret = (int)writev(fd, iov, 3);
if (ret < (int)iov[1].iov_len + 2)
goto rollback;

@@ -970,7 +972,7 @@ static int probe_cache_entry__write(struct probe_cache_entry *entry, int fd)
iov[0].iov_base = (void *)snode->s;
iov[0].iov_len = strlen(snode->s);
iov[1].iov_base = (void *)"\n"; iov[1].iov_len = 1;
- ret = writev(fd, iov, 2);
+ ret = (int)writev(fd, iov, 2);
if (ret < (int)iov[0].iov_len + 1)
goto rollback;
}
@@ -992,7 +994,7 @@ int probe_cache__commit(struct probe_cache *pcache)
int ret = 0;

/* TBD: if we do not update existing entries, skip it */
- ret = lseek(pcache->fd, 0, SEEK_SET);
+ ret = (int)lseek(pcache->fd, 0, SEEK_SET);
if (ret < 0)
goto out;

--
2.49.0.504.g3bcea36a83-goog