Fix: cppcheck linter cleanups

[lttng-tools.git] / src / common / compat / compat-poll.c

diff --git a/src/common/compat/compat-poll.c b/src/common/compat/compat-poll.c
index 7b15c737e6a0333ce5044ce2402d62d35aa1f643..bacd96e842be04c0719f740205e42852972b5f8e 100644 (file)
--- a/src/common/compat/compat-poll.c
+++ b/src/common/compat/compat-poll.c
@@ -1,26 +1,27 @@
 /*
  * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 
-#include <lttngerr.h>
 #include <common/defaults.h>
+#include <common/error.h>
 
 #include "poll.h"
 
@@ -163,7 +164,11 @@ int compat_poll_wait(struct lttng_poll_event *events, int timeout)
                goto error;
        }
 
-       return ret;
+       /*
+        * poll() should always iterate on all FDs since we handle the pollset in
+        * user space and after poll returns, we have to try every fd for a match.
+        */
+       return events->nb_fd;
 
 error:
        return -1;