Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[linux-2.6-microblaze.git] / tools / perf / util / map.c

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index a08ca27..53d9661 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -44,8 +44,8 @@ static inline int is_no_dso_memory(const char *filename)
 
 static inline int is_android_lib(const char *filename)
 {
-       return !strncmp(filename, "/data/app-lib", 13) ||
-              !strncmp(filename, "/system/lib", 11);
+       return strstarts(filename, "/data/app-lib/") ||
+              strstarts(filename, "/system/lib/");
 }
 
 static inline bool replace_android_lib(const char *filename, char *newfilename)
@@ -65,7 +65,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename)
 
        app_abi_length = strlen(app_abi);
 
-       if (!strncmp(filename, "/data/app-lib", 13)) {
+       if (strstarts(filename, "/data/app-lib/")) {
                char *apk_path;
 
                if (!app_abi_length)
@@ -89,7 +89,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename)
                return true;
        }
 
-       if (!strncmp(filename, "/system/lib/", 11)) {
+       if (strstarts(filename, "/system/lib/")) {
                char *ndk, *app;
                const char *arch;
                size_t ndk_length;
@@ -431,7 +431,7 @@ int map__fprintf_srcline(struct map *map, u64 addr, const char *prefix,
 
        if (map && map->dso) {
                char *srcline = map__srcline(map, addr, NULL);
-               if (srcline != SRCLINE_UNKNOWN)
+               if (strncmp(srcline, SRCLINE_UNKNOWN, strlen(SRCLINE_UNKNOWN)) != 0)
                        ret = fprintf(fp, "%s%s", prefix, srcline);
                free_srcline(srcline);
        }