selftests/bpf: Fix procmap_query()'s params mismatch and compilation warning
Subsystems (3)
PATCH 1/1 selftests/bpf: Fix procmap_query()'s params mismatch and compilation warning
From: Yuan Chen <[email protected]>
When the PROCMAP_QUERY is not defined, a compilation error occurs due to the mismatch of the procmap_query()'s params, procmap_query() only be called in the file where the function is defined, modify the params so they can match.
We get a warning when build samples/bpf:
trace_helpers.c:252:5: warning: no previous prototype for ‘procmap_query’ [-Wmissing-prototypes]
252 | int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags)
| ^~~~~~~~~~~~~
As this function is only used in the file, mark it as 'static'.
--- tools/testing/selftests/bpf/trace_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/trace_helpers.c +2 -2
@@ -249,7 +249,7 @@ int kallsyms_find(const char *sym, unsigned long long *addr)#ifdef PROCMAP_QUERY int env_verbosity__weak =0 ; -int procmap_query (int fd,const void *addr,__u32 query_flags,size_t *start,size_t *offset,int *flags) +static int procmap_query (int fd,const void *addr,__u32 query_flags,size_t *start,size_t *offset,int *flags) {char path_buf[PATH_MAX ], build_id_buf[20 ];struct procmap_query q;
@@ -293,7 +293,7 @@ int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, si return 0; }#else -int procmap_query (int fd,const void *addr,size_t *start,size_t *offset,int *flags) +static int procmap_query (int fd,const void *addr,__u32 query_flags,size_t *start,size_t *offset,int *flags) {return -EOPNOTSUPP ; }
Signature · 1 line
2.46.0
Quoted 6 lines · Yuan Chen
From: Yuan Chen <[email protected]>
When the
PROCMAP_QUERYis not defined, a compilation error occurs due to the mismatch of the procmap_query()'s params,procmap_query()only be called in the file where the function is defined, modify the params so they can match.
Quoted 7 lines
We get a warning when build
samples/bpf:
trace_helpers.c:252:5: warning: no previous prototype for ‘procmap_query’ [-Wmissing-prototypes]
252 | intprocmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags)
| ^~~~~~~~~~~~~
As this function is only used in the file, mark it as 'static'.Signed-off-by Yuan Chen <[email protected]>
perhaps also
jirka
Quoted 30 lines
--- tools/testing/selftests/bpf/trace_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/trace_helpers.c +2
-2@@ -249,7 +249,7 @@ int kallsyms_find(const char *sym, unsigned long long *addr)#ifdef PROCMAP_QUERY int env_verbosity__weak =0 ; -int procmap_query (int fd,const void *addr,__u32 query_flags,size_t *start,size_t *offset,int *flags) +static int procmap_query (int fd,const void *addr,__u32 query_flags,size_t *start,size_t *offset,int *flags) {char path_buf[PATH_MAX ], build_id_buf[20 ];struct procmap_query q;@@ -293,7 +293,7 @@ int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, si return 0; }#else -int procmap_query (int fd,const void *addr,size_t *start,size_t *offset,int *flags) +static int procmap_query (int fd,const void *addr,__u32 query_flags,size_t *start,size_t *offset,int *flags) {return -EOPNOTSUPP ; }Signature · 1 line
2.46.0