libbpf-tools: Make custom libbpf callback function static

Update all tools to make libbpf_print_fn function static. While
at it, also keep the function signature in a single line since
they fit in a 100-character line.

Signed-off-by: Hengqi Chen <chenhengqi@outlook.com>

diff --git a/libbpf-tools/biolatency.c b/libbpf-tools/biolatency.c
index dc8f23b20317f270f5cd3e96b43ab73855c4cf54..bc0b0f75129b491f313d223e69f0ba2e1e2f44f2 100644 (file)
--- a/libbpf-tools/biolatency.c
+++ b/libbpf-tools/biolatency.c
@@ -133,8 +133,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-               const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/biopattern.c b/libbpf-tools/biopattern.c
index e963b326344d9b347381d51a010eeed75fc0abe2..e983ce1382bbcfd0c1475c9048d76da573b20dc4 100644 (file)
--- a/libbpf-tools/biopattern.c
+++ b/libbpf-tools/biopattern.c
@@ -97,8 +97,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/biosnoop.c b/libbpf-tools/biosnoop.c
index e983de932505cd8d94c3fde308e72ebdc6ede850..c76a2eb9808bf9e18335e4a1caed17d80ba5b65b 100644 (file)
--- a/libbpf-tools/biosnoop.c
+++ b/libbpf-tools/biosnoop.c
@@ -102,8 +102,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-               const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/biostacks.c b/libbpf-tools/biostacks.c
index d002a8b88ce3ae58ca99eeb166322acabfd7d61c..f99dc56d8b17a0cd1279e3ac3f6afbc2466f0aaf 100644 (file)
--- a/libbpf-tools/biostacks.c
+++ b/libbpf-tools/biostacks.c
@@ -83,8 +83,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-               const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/bitesize.c b/libbpf-tools/bitesize.c
index 36760eb0ed2968d1f4e3911f64e5c010b9be741b..c39541b38eace028f87e4cc9c9f4ea91a5c41a32 100644 (file)
--- a/libbpf-tools/bitesize.c
+++ b/libbpf-tools/bitesize.c
@@ -105,8 +105,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/cachestat.c b/libbpf-tools/cachestat.c
index 3769d939d833e034417cebc887ca961e77fd8f0c..05785251328e1ff6b9f1abe495e94da8c79069a2 100644 (file)
--- a/libbpf-tools/cachestat.c
+++ b/libbpf-tools/cachestat.c
@@ -86,8 +86,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/cpudist.c b/libbpf-tools/cpudist.c
index 2246972278a7de2e1d9bd3a5ea2948e4226e4974..f76d8a671df6921ebd3cdc61af53739eacd2e31a 100644 (file)
--- a/libbpf-tools/cpudist.c
+++ b/libbpf-tools/cpudist.c
@@ -121,8 +121,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/cpufreq.c b/libbpf-tools/cpufreq.c
index e42bca948e7bea600f579d70afac0defe6f278bb..c58395604323c9b7277f9eda3a7aeb288339acca 100644 (file)
--- a/libbpf-tools/cpufreq.c
+++ b/libbpf-tools/cpufreq.c
@@ -112,8 +112,7 @@ static int open_and_attach_perf_event(int freq, struct bpf_program *prog,
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/drsnoop.c b/libbpf-tools/drsnoop.c
index 739dbdc7957efebd2435b069c5d3564350cd4515..705db9a4f7a8c61d39aace0eee5670610c28fc5d 100644 (file)
--- a/libbpf-tools/drsnoop.c
+++ b/libbpf-tools/drsnoop.c
@@ -104,8 +104,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/execsnoop.c b/libbpf-tools/execsnoop.c
index 9166c1bdfad3c0ea851688300528c4ef0716109c..38294816f9241e63a0d4b4d596cada6b60fad228 100644 (file)
--- a/libbpf-tools/execsnoop.c
+++ b/libbpf-tools/execsnoop.c
@@ -133,8 +133,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-static int libbpf_print_fn(enum libbpf_print_level level,
-                          const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/filelife.c b/libbpf-tools/filelife.c
index 1e834c51472228536d1d43ea7148e907e5fbff81..ba6b9440d77451bb6b593fa79fc8d2da01396ed7 100644 (file)
--- a/libbpf-tools/filelife.c
+++ b/libbpf-tools/filelife.c
@@ -71,8 +71,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/fsdist.c b/libbpf-tools/fsdist.c
index 4fb405db215228291e3a3bcdac213b25723690a9..f411d162897f2fddef0d046841951a550e4c6627 100644 (file)
--- a/libbpf-tools/fsdist.c
+++ b/libbpf-tools/fsdist.c
@@ -194,8 +194,7 @@ static void alias_parse(char *prog)
        }
 }
 
-static int libbpf_print_fn(enum libbpf_print_level level,
-                          const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !verbose)
                return 0;

diff --git a/libbpf-tools/fsslower.c b/libbpf-tools/fsslower.c
index f5cec98376bd88ea4cccef8878649734796184e8..e96c9efaec0d8c620a17a32bf657976d55f4f51d 100644 (file)
--- a/libbpf-tools/fsslower.c
+++ b/libbpf-tools/fsslower.c
@@ -180,8 +180,7 @@ static void alias_parse(char *prog)
        }
 }
 
-static int libbpf_print_fn(enum libbpf_print_level level,
-                          const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !verbose)
                return 0;

diff --git a/libbpf-tools/hardirqs.c b/libbpf-tools/hardirqs.c
index ee2bc5a3f9350f34e61faef1c3e2e73defd335aa..a2475ef1b7ef6382bd176b6be2cb20aebd5c90ff 100644 (file)
--- a/libbpf-tools/hardirqs.c
+++ b/libbpf-tools/hardirqs.c
@@ -105,8 +105,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-               const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/llcstat.c b/libbpf-tools/llcstat.c
index 89b49efeb5435fae3b8ba304d3c477b2dc237f15..be437bc20ba2b40d54f6ea2a7f1022ac919a14b6 100644 (file)
--- a/libbpf-tools/llcstat.c
+++ b/libbpf-tools/llcstat.c
@@ -115,8 +115,7 @@ static int open_and_attach_perf_event(__u64 config, int period,
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/numamove.c b/libbpf-tools/numamove.c
index ba7454e86d352926eb0c6ac3022f68f548ad421f..0747f84104363e8e084fe05afd82878696d1138e 100644 (file)
--- a/libbpf-tools/numamove.c
+++ b/libbpf-tools/numamove.c
@@ -51,8 +51,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;
@@ -89,7 +88,7 @@ int main(int argc, char **argv)
                fprintf(stderr, "failed to open and/or load BPF object\n");
                return 1;
        }
-       
+
        if (!obj->bss) {
                fprintf(stderr, "Memory-mapping BPF maps is supported starting from Linux 5.7, please upgrade.\n");
                goto cleanup;

diff --git a/libbpf-tools/offcputime.c b/libbpf-tools/offcputime.c
index a9a18721d1d6395ce25fbe62e85136ce0b7683b1..37a8ec2c065b395de1f046b795a9204e032d59ba 100644 (file)
--- a/libbpf-tools/offcputime.c
+++ b/libbpf-tools/offcputime.c
@@ -176,8 +176,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/opensnoop.c b/libbpf-tools/opensnoop.c
index 1754b81ebf51c9b43476d534b9e4ee6b19014702..557a63cdfd24d6fcf3405bfd39a7c6e8bf220906 100644 (file)
--- a/libbpf-tools/opensnoop.c
+++ b/libbpf-tools/opensnoop.c
@@ -160,8 +160,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/readahead.c b/libbpf-tools/readahead.c
index c55b0dbbac44bd2386531f1fde60de3be975853e..17079389c5a6873c4b98ed67b9c63a96bc40847a 100644 (file)
--- a/libbpf-tools/readahead.c
+++ b/libbpf-tools/readahead.c
@@ -64,8 +64,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/runqlat.c b/libbpf-tools/runqlat.c
index bcccf0d62e852e440ec3bf62627d20b46f9987bc..5a60b874ddffa5ac5fbedffeaf2305d33a24fa2e 100644 (file)
--- a/libbpf-tools/runqlat.c
+++ b/libbpf-tools/runqlat.c
@@ -123,8 +123,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/runqlen.c b/libbpf-tools/runqlen.c
index 43c65246249680eb32acc1deb10c91ce3e70a9a7..9cbbc739c0c0d5de7e79e452aee2503d4a13d914 100644 (file)
--- a/libbpf-tools/runqlen.c
+++ b/libbpf-tools/runqlen.c
@@ -155,8 +155,7 @@ static int open_and_attach_perf_event(int freq, struct bpf_program *prog,
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/runqslower.c b/libbpf-tools/runqslower.c
index c95995952135f33e53a66c8bee64b73f92209678..b038173e11f21d71410b7f7d9be433cd63837051 100644 (file)
--- a/libbpf-tools/runqslower.c
+++ b/libbpf-tools/runqslower.c
@@ -105,8 +105,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/softirqs.c b/libbpf-tools/softirqs.c
index b634d93ae218388bbecd053dc9cf13494d7ea374..34cfdb775260af1d5d9b04726632736c92c17a3a 100644 (file)
--- a/libbpf-tools/softirqs.c
+++ b/libbpf-tools/softirqs.c
@@ -100,8 +100,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-               const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/syscount.c b/libbpf-tools/syscount.c
index b677a01dea8b64102821ba82d8ef9cff1808fe14..2d6875735f6dd49dc70c43d4bc394d6a6b03e032 100644 (file)
--- a/libbpf-tools/syscount.c
+++ b/libbpf-tools/syscount.c
@@ -94,8 +94,7 @@ static int get_int(const char *arg, int *ret, int min, int max)
        return 0;
 }
 
-static int libbpf_print_fn(enum libbpf_print_level level,
-                          const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/tcpconnect.c b/libbpf-tools/tcpconnect.c
index bd3b56b6dcf66ac1fe59c954f874d5743555552f..101cf72bb8c6648fe798f75f1249ca65f6f23b9d 100644 (file)
--- a/libbpf-tools/tcpconnect.c
+++ b/libbpf-tools/tcpconnect.c
@@ -186,8 +186,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-static int libbpf_print_fn(enum libbpf_print_level level,
-               const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/tcpconnlat.c b/libbpf-tools/tcpconnlat.c
index c44a730948bac89629dad053adf3b8fb42d2018e..8eae76aeadab93e3d49d20273e03370292f9b1cf 100644 (file)
--- a/libbpf-tools/tcpconnlat.c
+++ b/libbpf-tools/tcpconnlat.c
@@ -97,8 +97,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-int libbpf_print_fn(enum libbpf_print_level level,
-                   const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/tcprtt.c b/libbpf-tools/tcprtt.c
index 44a5505a5244714d045a8ef8cbefbcc80166749e..e847b8d2e9f8d5ef14a2aa0858bd2a45d9b867fc 100644 (file)
--- a/libbpf-tools/tcprtt.c
+++ b/libbpf-tools/tcprtt.c
@@ -154,8 +154,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-static int libbpf_print_fn(enum libbpf_print_level level,
-                          const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;

diff --git a/libbpf-tools/vfsstat.c b/libbpf-tools/vfsstat.c
index 53183faddec4f5231351323d573a65a50328ac89..5519c366d3c98dcc93b23bae751d962cc2c4c179 100644 (file)
--- a/libbpf-tools/vfsstat.c
+++ b/libbpf-tools/vfsstat.c
@@ -78,8 +78,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
        return 0;
 }
 
-static int libbpf_print_fn(enum libbpf_print_level level,
-                          const char *format, va_list args)
+static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
 {
        if (level == LIBBPF_DEBUG && !env.verbose)
                return 0;