X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=d68bc5c2713eab333b80f9c7b196fa0b43de936c;hp=3d79b5122d82bb3f020f3efe920d86b93c493005;hb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;hpb=04253271daf725a84be2bc96ad12454f7422f611

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 3d79b5122..d68bc5c27 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -2,24 +2,22 @@
  * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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 <assert.h>
-#include <fcntl.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -641,7 +639,7 @@ void lttng_consumer_sync_trace_file(
 	if (orig_offset < stream->chan->max_sb_size) {
 		return;
 	}
-	sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
+	lttng_sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
 			stream->chan->max_sb_size,
 			SYNC_FILE_RANGE_WAIT_BEFORE
 			| SYNC_FILE_RANGE_WRITE
@@ -809,6 +807,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		ERR("Unknown consumer_data type");
 		assert(0);
 	}
+
+	return 0;
 }
 
 /*