Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2bfe0b authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Greg Kroah-Hartman
Browse files

tools/lib/subcmd/pager.c: do not alias select() params 

commit dfbc3c6cb747c074aa2ba0a10bbeea588d6dfda6 upstream.

[ Change applied file from tools/lib/subcmd/pager.c to
  tools/perf/util/pager.c ]

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: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f88efa4d

tools/perf/util/pager.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

}