perf probe: Fix compiles due to declarations using perf_probe_point
authorDavid Ahern <david.ahern@oracle.com>
Wed, 11 Mar 2015 14:36:20 +0000 (10:36 -0400)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 12 Mar 2015 15:40:00 +0000 (12:40 -0300)
perf fails to build with gcc "(GCC) 4.4.7 20120313 (Red Hat
4.4.7-4.0.9)" (a.k.a., RHEL6 / CentOS 6 / OL 6):

  cc1: warnings being treated as errors
  util/probe-event.c: In function ‘get_alternative_line_range’:
  util/probe-event.c:359: error: missing initializer
  util/probe-event.c:359: error: (near initialization for ‘pp.file’)
  util/probe-event.c:359: error: missing initializer
  util/probe-event.c:359: error: (near initialization for ‘result.function’)

Fix by bringing in initializers to declaration.

Signed-off-by: David Ahern <david.ahern@oracle.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Link: http://lkml.kernel.org/r/1426084580-60780-1-git-send-email-david.ahern@oracle.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/probe-event.c

index e2bf620f98cb29b6d5cc89010fa0fbdc8ce589bc..f272a711ad15c5182976681b7c99fc0a229a8267 100644 (file)
@@ -356,12 +356,14 @@ static int get_alternative_line_range(struct debuginfo *dinfo,
                                      struct line_range *lr,
                                      const char *target, bool user)
 {
-       struct perf_probe_point pp = { 0 }, result = { 0 };
+       struct perf_probe_point pp = { .function = lr->function,
+                                      .file = lr->file,
+                                      .line = lr->start };
+       struct perf_probe_point result;
        int ret, len = 0;
 
-       pp.function = lr->function;
-       pp.file = lr->file;
-       pp.line = lr->start;
+       memset(&result, 0, sizeof(result));
+
        if (lr->end != INT_MAX)
                len = lr->end - lr->start;
        ret = find_alternative_probe_point(dinfo, &pp, &result,