Skip to content

Commit

Permalink
tools/lib/subcmd/pager.c: do not alias select() params
Browse files Browse the repository at this point in the history
commit ad343a9 upstream.

Use a separate fd set for select()-s exception fds param to fix the
following gcc warning:

  pager.c:36:12: error: passing argument 2 to restrict-qualified parameter aliases with argument 4 [-Werror=restrict]
    select(1, &in, NULL, &in, NULL);
              ^~~        ~~~

Link: http://lkml.kernel.org/r/20180101105626.7168-1-sergey.senozhatsky@gmail.com
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.16: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
Sergey Senozhatsky authored and Ben Hutchings committed Nov 20, 2018
1 parent d380aea commit 8a75195
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tools/perf/util/pager.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ static void pager_preexec(void)
* have real input
*/
fd_set in;
fd_set exception;

FD_ZERO(&in);
FD_ZERO(&exception);
FD_SET(0, &in);
select(1, &in, NULL, &in, NULL);
FD_SET(0, &exception);
select(1, &in, NULL, &exception, NULL);

setenv("LESS", "FRSX", 0);
}
Expand Down

0 comments on commit 8a75195

Please sign in to comment.