Commit b946cd37 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf tools: Remove ext from struct kmod_path

Having comp carrying the compression ID, we no longer need return the
extension. Removing it and updating the automated test.
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180817094813.15086-14-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 88c74dc7
This diff is collapsed.
...@@ -331,7 +331,7 @@ int dso__decompress_kmodule_path(struct dso *dso, const char *name, ...@@ -331,7 +331,7 @@ int dso__decompress_kmodule_path(struct dso *dso, const char *name,
* Returns 0 if there's no strdup error, -ENOMEM otherwise. * Returns 0 if there's no strdup error, -ENOMEM otherwise.
*/ */
int __kmod_path__parse(struct kmod_path *m, const char *path, int __kmod_path__parse(struct kmod_path *m, const char *path,
bool alloc_name, bool alloc_ext) bool alloc_name)
{ {
const char *name = strrchr(path, '/'); const char *name = strrchr(path, '/');
const char *ext = strrchr(path, '.'); const char *ext = strrchr(path, '.');
...@@ -391,14 +391,6 @@ int __kmod_path__parse(struct kmod_path *m, const char *path, ...@@ -391,14 +391,6 @@ int __kmod_path__parse(struct kmod_path *m, const char *path,
strxfrchar(m->name, '-', '_'); strxfrchar(m->name, '-', '_');
} }
if (alloc_ext && m->comp) {
m->ext = strdup(ext + 4);
if (!m->ext) {
free((void *) m->name);
return -ENOMEM;
}
}
return 0; return 0;
} }
......
...@@ -262,17 +262,15 @@ int dso__decompress_kmodule_path(struct dso *dso, const char *name, ...@@ -262,17 +262,15 @@ int dso__decompress_kmodule_path(struct dso *dso, const char *name,
struct kmod_path { struct kmod_path {
char *name; char *name;
char *ext;
int comp; int comp;
bool kmod; bool kmod;
}; };
int __kmod_path__parse(struct kmod_path *m, const char *path, int __kmod_path__parse(struct kmod_path *m, const char *path,
bool alloc_name, bool alloc_ext); bool alloc_name);
#define kmod_path__parse(__m, __p) __kmod_path__parse(__m, __p, false, false) #define kmod_path__parse(__m, __p) __kmod_path__parse(__m, __p, false)
#define kmod_path__parse_name(__m, __p) __kmod_path__parse(__m, __p, true , false) #define kmod_path__parse_name(__m, __p) __kmod_path__parse(__m, __p, true)
#define kmod_path__parse_ext(__m, __p) __kmod_path__parse(__m, __p, false, true)
void dso__set_module_info(struct dso *dso, struct kmod_path *m, void dso__set_module_info(struct dso *dso, struct kmod_path *m,
struct machine *machine); struct machine *machine);
......
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