Re: [PATCH v7 05/18] perf hists: Introduce hist_entry__filter()

From: Arnaldo Carvalho de Melo
Date: Wed Feb 24 2016 - 18:23:03 EST


Em Thu, Feb 25, 2016 at 12:13:37AM +0900, Namhyung Kim escreveu:
> +static int hist_entry__socket_filter(struct hist_entry *he, int type, const void *arg)
> +{
> + int socket = *(const int *)arg;
> +
> + if (type != HIST_FILTER__SOCKET)
> + return -1;
> +
> + return socket >= 0 && he->socket != socket;

'socket' is a function in sys/socket.h, and in older systems this file,
tools/perf/util/sort.c, ends up including that header, causing:

CC /tmp/build/perf/util/sort.o
cc1: warnings being treated as errors
util/sort.c: In function âhist_entry__socket_filterâ:
util/sort.c:479: error: declaration of âsocketâ shadows a global
declaration
/usr/include/sys/socket.h:105: error: shadowed declaration is here

I fixed it renaming it to 'sk'.

- Arnaldo