perf tools: Remove unused perf_pathdup, xstrdup functions

Cc: Adrian Hunter <adrian.hunter@intel.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-s87zi5d03m6rz622y1z6rlsa@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 531d2410
...@@ -70,7 +70,4 @@ char *strip_path_suffix(const char *path, const char *suffix); ...@@ -70,7 +70,4 @@ 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))); char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
char *perf_pathdup(const char *fmt, ...)
__attribute__((format (printf, 1, 2)));
#endif /* __PERF_CACHE_H */ #endif /* __PERF_CACHE_H */
...@@ -41,36 +41,6 @@ static char *cleanup_path(char *path) ...@@ -41,36 +41,6 @@ static char *cleanup_path(char *path)
return path; return path;
} }
static char *perf_vsnpath(char *buf, size_t n, const char *fmt, va_list args)
{
const char *perf_dir = get_perf_dir();
size_t len;
len = strlen(perf_dir);
if (n < len + 1)
goto bad;
memcpy(buf, perf_dir, len);
if (len && !is_dir_sep(perf_dir[len-1]))
buf[len++] = '/';
len += vsnprintf(buf + len, n - len, fmt, args);
if (len >= n)
goto bad;
return cleanup_path(buf);
bad:
strlcpy(buf, bad_path, n);
return buf;
}
char *perf_pathdup(const char *fmt, ...)
{
char path[PATH_MAX];
va_list args;
va_start(args, fmt);
(void)perf_vsnpath(path, sizeof(path), fmt, args);
va_end(args);
return xstrdup(path);
}
char *mkpath(const char *fmt, ...) char *mkpath(const char *fmt, ...)
{ {
va_list args; va_list args;
......
...@@ -162,7 +162,6 @@ static inline char *gitstrchrnul(const char *s, int c) ...@@ -162,7 +162,6 @@ static inline char *gitstrchrnul(const char *s, int c)
/* /*
* Wrappers: * Wrappers:
*/ */
char *xstrdup(const char *str);
void *xrealloc(void *ptr, size_t size) __attribute__((weak)); void *xrealloc(void *ptr, size_t size) __attribute__((weak));
......
...@@ -12,18 +12,6 @@ static inline void release_pack_memory(size_t size __maybe_unused, ...@@ -12,18 +12,6 @@ static inline void release_pack_memory(size_t size __maybe_unused,
{ {
} }
char *xstrdup(const char *str)
{
char *ret = strdup(str);
if (!ret) {
release_pack_memory(strlen(str) + 1, -1);
ret = strdup(str);
if (!ret)
die("Out of memory, strdup failed");
}
return ret;
}
void *xrealloc(void *ptr, size_t size) void *xrealloc(void *ptr, size_t size)
{ {
void *ret = realloc(ptr, size); void *ret = realloc(ptr, size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment