X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Ftrimmer%2Fiterator.c;h=1e94b15ecc6d5a1a0e588f5fc8860f2522bf9174;hb=73d5c1adb1411e16c9c613c38a4c74a29ee608ae;hp=dcff7ecaac8ee64a0fb7b8f780cb5658c2a67845;hpb=a8e317ffdeb01060409d3faa944a4f0c9190b83e;p=babeltrace.git

diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c
index dcff7eca..1e94b15e 100644
--- a/plugins/utils/trimmer/iterator.c
+++ b/plugins/utils/trimmer/iterator.c
@@ -26,6 +26,8 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/compat/time-internal.h>
+#include <babeltrace/compat/utc-internal.h>
 #include <babeltrace/graph/notification-iterator.h>
 #include <babeltrace/graph/private-notification-iterator.h>
 #include <babeltrace/graph/notification.h>
@@ -37,6 +39,7 @@
 #include <babeltrace/graph/private-port.h>
 #include <babeltrace/graph/private-connection.h>
 #include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/connection.h>
 #include <babeltrace/ctf-ir/event.h>
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-class.h>
@@ -83,6 +86,7 @@ enum bt_notification_iterator_status trimmer_iterator_init(
 	enum bt_notification_iterator_status ret =
 		BT_NOTIFICATION_ITERATOR_STATUS_OK;
 	enum bt_notification_iterator_status it_ret;
+	enum bt_connection_status conn_status;
 	struct bt_private_port *input_port = NULL;
 	struct bt_private_connection *connection = NULL;
 	struct bt_private_component *component =
@@ -108,11 +112,10 @@ enum bt_notification_iterator_status trimmer_iterator_init(
 	connection = bt_private_port_get_private_connection(input_port);
 	assert(connection);
 
-	it_data->input_iterator =
-		bt_private_connection_create_notification_iterator(connection,
-			notif_types);
-	if (!it_data->input_iterator) {
-		ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
+	conn_status = bt_private_connection_create_notification_iterator(connection,
+			notif_types, &it_data->input_iterator);
+	if (conn_status != BT_CONNECTION_STATUS_OK) {
+		ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
 		goto end;
 	}
 
@@ -150,23 +153,23 @@ int update_lazy_bound(struct trimmer_bound *bound, const char *name,
 
 	if (bound->lazy_values.gmt) {
 		/* Get day, month, year. */
-		if (!gmtime_r(&timeval, &tm)) {
-			printf_error("Failure in gmtime_r()");
+		if (!bt_gmtime_r(&timeval, &tm)) {
+			printf_error("Failure in bt_gmtime_r()");
 			goto error;
 		}
 		tm.tm_sec = bound->lazy_values.ss;
 		tm.tm_min = bound->lazy_values.mm;
 		tm.tm_hour = bound->lazy_values.hh;
-		timeval = timegm(&tm);
+		timeval = bt_timegm(&tm);
 		if (timeval < 0) {
-			printf_error("Failure in timegm(), incorrectly formatted %s timestamp",
+			printf_error("Failure in bt_timegm(), incorrectly formatted %s timestamp",
 					name);
 			goto error;
 		}
 	} else {
 		/* Get day, month, year. */
-		if (!localtime_r(&timeval, &tm)) {
-			printf_error("Failure in localtime_r()");
+		if (!bt_localtime_r(&timeval, &tm)) {
+			printf_error("Failure in bt_localtime_r()");
 			goto error;
 		}
 		tm.tm_sec = bound->lazy_values.ss;