aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2012-08-27 03:38:26 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-09-20 07:36:34 -0400
commit8f28f19a87cb48d13570ba774a3e85776eb36bb4 (patch)
tree7dc643cce7503e5eac7667e635147439d65b2de6
parentb1ab1bd1921536c2a97adb888effeff4370a3246 (diff)
perf tools: Fix a compiling error in util/map.c
This patch fix a compile warning taken as error: CC util/map.o cc1: warnings being treated as errors util/map.c: In function ‘map__fprintf_dsoname’: util/map.c:240: error: ‘dsoname’ may be used uninitialized in this function make: *** [util/map.o] Error 1 Signed-off-by: Feng Tang <feng.tang@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1346053107-11946-3-git-send-email-feng.tang@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/map.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index b442ee49452b..ead5316b3f89 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -243,15 +243,14 @@ size_t map__fprintf(struct map *self, FILE *fp)
243 243
244size_t map__fprintf_dsoname(struct map *map, FILE *fp) 244size_t map__fprintf_dsoname(struct map *map, FILE *fp)
245{ 245{
246 const char *dsoname; 246 const char *dsoname = "[unknown]";
247 247
248 if (map && map->dso && (map->dso->name || map->dso->long_name)) { 248 if (map && map->dso && (map->dso->name || map->dso->long_name)) {
249 if (symbol_conf.show_kernel_path && map->dso->long_name) 249 if (symbol_conf.show_kernel_path && map->dso->long_name)
250 dsoname = map->dso->long_name; 250 dsoname = map->dso->long_name;
251 else if (map->dso->name) 251 else if (map->dso->name)
252 dsoname = map->dso->name; 252 dsoname = map->dso->name;
253 } else 253 }
254 dsoname = "[unknown]";
255 254
256 return fprintf(fp, "%s", dsoname); 255 return fprintf(fp, "%s", dsoname);
257} 256}