perf maps: Move getting debug_file to verbose path

Getting debug_file can trigger warnings if not set. Avoid getting
these warnings by pushing the use under the controlling if.

Signed-off-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c
index 4092211cff62b41000afde64a7e2b8a95bcd0db9..7dd6da9d1e4f030e8e38f4ed1878059e460a5571 100644 (file)
--- a/tools/perf/util/maps.c
+++ b/tools/perf/util/maps.c
@@ -844,7 +844,6 @@ static int __maps__insert_sorted(struct maps *maps, unsigned int first_after_ind
 static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
 {
        int err = 0;
-       FILE *fp = debug_file();
        unsigned int i, ni = INT_MAX; // Some gcc complain, but depends on maps_by_name...
 
        if (!maps__maps_by_address_sorted(maps))
@@ -872,8 +871,8 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
                                dso__name(map__dso(new)));
                } else if (verbose >= 2) {
                        pr_debug("overlapping maps:\n");
-                       map__fprintf(new, fp);
-                       map__fprintf(pos, fp);
+                       map__fprintf(new, debug_file());
+                       map__fprintf(pos, debug_file());
                }
 
                if (maps_by_name)
@@ -894,7 +893,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
                        map__set_end(before, map__start(new));
 
                        if (verbose >= 2 && !use_browser)
-                               map__fprintf(before, fp);
+                               map__fprintf(before, debug_file());
                }
                if (map__end(new) < map__end(pos)) {
                        /* The new map isn't as long as the existing map. */
@@ -912,7 +911,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)
                               map__map_ip(after, map__end(new)));
 
                        if (verbose >= 2 && !use_browser)
-                               map__fprintf(after, fp);
+                               map__fprintf(after, debug_file());
                }
                /*
                 * If adding one entry, for `before` or `after`, we can replace