From b277040fde135e634bb90892a360ec1f1c13158d Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (Google)" Date: Tue, 22 Feb 2022 19:30:06 -0500 Subject: libtracefs: Hide tracefs_list_pop() and make it trace_list_pop() The tracefs_list_pop() is not ready to be exposed as an API. Make it hidden and rename it to trace_list_pop(). Link: https://lore.kernel.org/linux-trace-devel/20220223003012.1334741-6-rostedt@goodmis.org Signed-off-by: Steven Rostedt (Google) --- include/tracefs-local.h | 1 + include/tracefs.h | 1 - src/tracefs-hist.c | 10 +++++----- src/tracefs-utils.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/tracefs-local.h b/include/tracefs-local.h index bf157e1..926fd02 100644 --- a/include/tracefs-local.h +++ b/include/tracefs-local.h @@ -71,6 +71,7 @@ struct tracefs_options_mask * enabled_opts_mask(struct tracefs_instance *instance); char **trace_list_create_empty(void); +int trace_list_pop(char **list); char *append_string(char *str, const char *delim, const char *add); int trace_test_state(int state); diff --git a/include/tracefs.h b/include/tracefs.h index 1848ad0..301f1b1 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -75,7 +75,6 @@ int tracefs_error_clear(struct tracefs_instance *instance); void tracefs_list_free(char **list); char **tracefs_list_add(char **list, const char *string); int tracefs_list_size(char **list); -int tracefs_list_pop(char **list); /** * tracefs_trace_on_get_fd - Get a file descriptor of "tracing_on" in given instance diff --git a/src/tracefs-hist.c b/src/tracefs-hist.c index aec61ad..5a89be2 100644 --- a/src/tracefs-hist.c +++ b/src/tracefs-hist.c @@ -1096,14 +1096,14 @@ static int add_synth_fields(struct tracefs_synth *synth, ret = asprintf(&str, "$%s", name); if (ret < 0) { - tracefs_list_pop(synth->synthetic_fields); + trace_list_pop(synth->synthetic_fields); return -1; } list = tracefs_list_add(synth->synthetic_args, str); free(str); if (!list) { - tracefs_list_pop(synth->synthetic_fields); + trace_list_pop(synth->synthetic_fields); return -1; } @@ -1156,7 +1156,7 @@ int tracefs_synth_add_match_field(struct tracefs_synth *synth, list = tracefs_list_add(synth->end_keys, end_match_field); if (!list) { - tracefs_list_pop(synth->start_keys); + trace_list_pop(synth->start_keys); return -1; } synth->end_keys = list; @@ -1176,8 +1176,8 @@ int tracefs_synth_add_match_field(struct tracefs_synth *synth, return 0; pop_lists: - tracefs_list_pop(synth->start_keys); - tracefs_list_pop(synth->end_keys); + trace_list_pop(synth->start_keys); + trace_list_pop(synth->end_keys); return -1; } diff --git a/src/tracefs-utils.c b/src/tracefs-utils.c index a502c2d..0ad9a35 100644 --- a/src/tracefs-utils.c +++ b/src/tracefs-utils.c @@ -448,14 +448,14 @@ char **tracefs_list_add(char **list, const char *string) return list; } -/** - * tracefs_list_pop - Removes the last string added +/* + * trace_list_pop - Removes the last string added * @list: The list to remove the last event from * * Returns 0 on success, -1 on error. * Returns 1 if the list is empty or NULL. */ -int tracefs_list_pop(char **list) +__hidden int trace_list_pop(char **list) { unsigned long size; -- cgit 1.2.3-korg