diff options
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/dso.c | 18 | ||||
| -rw-r--r-- | tools/perf/util/dso.h | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index b8b5fdb1a15b..d34e47bb09d9 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -189,10 +189,15 @@ int dso__read_binary_type_filename(const struct dso *dso, return ret; } +enum { + COMP_ID__NONE = 0, +}; + static const struct { const char *fmt; int (*decompress)(const char *input, int output); } compressions[] = { + [COMP_ID__NONE] = { .fmt = NULL, }, #ifdef HAVE_ZLIB_SUPPORT { "gz", gzip_decompress_to_file }, #endif @@ -202,15 +207,15 @@ static const struct { { NULL, NULL }, }; -static bool is_supported_compression(const char *ext) +static int is_supported_compression(const char *ext) { unsigned i; - for (i = 0; compressions[i].fmt; i++) { + for (i = 1; compressions[i].fmt; i++) { if (!strcmp(ext, compressions[i].fmt)) - return true; + return i; } - return false; + return COMP_ID__NONE; } bool is_kernel_module(const char *pathname, int cpumode) @@ -372,10 +377,9 @@ int __kmod_path__parse(struct kmod_path *m, const char *path, return 0; } - if (is_supported_compression(ext + 1)) { - m->comp = true; + m->comp = is_supported_compression(ext + 1); + if (m->comp > COMP_ID__NONE) ext -= 3; - } /* Check .ko extension only if there's enough name left. */ if (ext > name) diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index 870346b333ee..7bde23f6e5a9 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -262,7 +262,7 @@ int dso__decompress_kmodule_path(struct dso *dso, const char *name, struct kmod_path { char *name; char *ext; - bool comp; + int comp; bool kmod; }; |