tools/lib/subcmd/pager.c: do not alias select() params
authorSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Thu, 2 Jul 2020 12:42:18 +0000 (21:42 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2020 14:43:16 +0000 (16:43 +0200)
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/perf/util/pager.c

index 53ef006a951c3f3c90ce8c62e9a5cd73b7750a74..b301d779c4af495d655617250316d14ca2bdfec6 100644 (file)
@@ -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);
 }