From 5241090bd12d55e72eaddf0dcb541f2b4147da7f Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Mon, 27 Aug 2012 15:38:26 +0800 Subject: [PATCH] --- yaml --- r: 323859 b: refs/heads/master c: 8f28f19a87cb48d13570ba774a3e85776eb36bb4 h: refs/heads/master i: 323857: 77392d34376f1f0520da9f5596dc8ec173e24e84 323855: 37bde0e45b8a62e60261ea74c5525b492f92bf18 v: v3 --- [refs] | 2 +- trunk/tools/perf/util/map.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cf46377d37a4..bb56cf17dc22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1ab1bd1921536c2a97adb888effeff4370a3246 +refs/heads/master: 8f28f19a87cb48d13570ba774a3e85776eb36bb4 diff --git a/trunk/tools/perf/util/map.c b/trunk/tools/perf/util/map.c index b442ee49452b..ead5316b3f89 100644 --- a/trunk/tools/perf/util/map.c +++ b/trunk/tools/perf/util/map.c @@ -243,15 +243,14 @@ size_t map__fprintf(struct map *self, FILE *fp) size_t map__fprintf_dsoname(struct map *map, FILE *fp) { - const char *dsoname; + const char *dsoname = "[unknown]"; if (map && map->dso && (map->dso->name || map->dso->long_name)) { if (symbol_conf.show_kernel_path && map->dso->long_name) dsoname = map->dso->long_name; else if (map->dso->name) dsoname = map->dso->name; - } else - dsoname = "[unknown]"; + } return fprintf(fp, "%s", dsoname); }