perf tools: Remove some unused functions

Probably are there since the beginning, taken from git but never used.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-lr65jeefffjeaywoapps9a6i@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 0102ef3e
...@@ -32,7 +32,6 @@ int perf_config_int(const char *, const char *); ...@@ -32,7 +32,6 @@ int perf_config_int(const char *, const char *);
u64 perf_config_u64(const char *, const char *); u64 perf_config_u64(const char *, const char *);
int perf_config_bool(const char *, const char *); int perf_config_bool(const char *, const char *);
int config_error_nonbool(const char *); int config_error_nonbool(const char *);
const char *perf_config_dirname(const char *, const char *);
const char *perf_etc_perfconfig(void); const char *perf_etc_perfconfig(void);
char *alias_lookup(const char *alias); char *alias_lookup(const char *alias);
...@@ -45,9 +44,6 @@ static inline int is_absolute_path(const char *path) ...@@ -45,9 +44,6 @@ static inline int is_absolute_path(const char *path)
return path[0] == '/'; return path[0] == '/';
} }
char *strip_path_suffix(const char *path, const char *suffix);
char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2))); char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
#endif /* __PERF_CACHE_H */ #endif /* __PERF_CACHE_H */
...@@ -372,7 +372,7 @@ int perf_config_bool(const char *name, const char *value) ...@@ -372,7 +372,7 @@ int perf_config_bool(const char *name, const char *value)
return !!perf_config_bool_or_int(name, value, &discard); return !!perf_config_bool_or_int(name, value, &discard);
} }
const char *perf_config_dirname(const char *name, const char *value) static const char *perf_config_dirname(const char *name, const char *value)
{ {
if (!name) if (!name)
return NULL; return NULL;
......
...@@ -14,14 +14,8 @@ ...@@ -14,14 +14,8 @@
static char bad_path[] = "/bad-path/"; static char bad_path[] = "/bad-path/";
/* /*
* Two hacks: * One hack:
*/ */
static const char *get_perf_dir(void)
{
return ".";
}
static char *get_pathname(void) static char *get_pathname(void)
{ {
static char pathname_array[4][PATH_MAX]; static char pathname_array[4][PATH_MAX];
...@@ -54,60 +48,3 @@ char *mkpath(const char *fmt, ...) ...@@ -54,60 +48,3 @@ char *mkpath(const char *fmt, ...)
return bad_path; return bad_path;
return cleanup_path(pathname); return cleanup_path(pathname);
} }
char *perf_path(const char *fmt, ...)
{
const char *perf_dir = get_perf_dir();
char *pathname = get_pathname();
va_list args;
unsigned len;
len = strlen(perf_dir);
if (len > PATH_MAX-100)
return bad_path;
memcpy(pathname, perf_dir, len);
if (len && perf_dir[len-1] != '/')
pathname[len++] = '/';
va_start(args, fmt);
len += vsnprintf(pathname + len, PATH_MAX - len, fmt, args);
va_end(args);
if (len >= PATH_MAX)
return bad_path;
return cleanup_path(pathname);
}
/* strip arbitrary amount of directory separators at end of path */
static inline int chomp_trailing_dir_sep(const char *path, int len)
{
while (len && is_dir_sep(path[len - 1]))
len--;
return len;
}
/*
* If path ends with suffix (complete path components), returns the
* part before suffix (sans trailing directory separators).
* Otherwise returns NULL.
*/
char *strip_path_suffix(const char *path, const char *suffix)
{
int path_len = strlen(path), suffix_len = strlen(suffix);
while (suffix_len) {
if (!path_len)
return NULL;
if (is_dir_sep(path[path_len - 1])) {
if (!is_dir_sep(suffix[suffix_len - 1]))
return NULL;
path_len = chomp_trailing_dir_sep(path, path_len);
suffix_len = chomp_trailing_dir_sep(suffix, suffix_len);
}
else if (path[--path_len] != suffix[--suffix_len])
return NULL;
}
if (path_len && !is_dir_sep(path[path_len - 1]))
return NULL;
return strndup(path, chomp_trailing_dir_sep(path, path_len));
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册