X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink.c;h=0672890a8d4ad4fd63611a9497c51d8c96e8b1ee;hb=6648e8481c9bfc91619aed26b0ea41b5b508988e;hp=2cfc2048cc590bd0e46be4827a459dedcd35fc81;hpb=9a2c8b8e0cb6579066b4b8ceb8255cdd5175bb2d;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink.c b/src/plugins/ctf/fs-sink/fs-sink.c
index 2cfc2048..0672890a 100644
--- a/src/plugins/ctf/fs-sink/fs-sink.c
+++ b/src/plugins/ctf/fs-sink/fs-sink.c
@@ -1,23 +1,7 @@
 /*
- * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_COMP_LOG_SELF_COMP (fs_sink->self_comp)
@@ -466,7 +450,7 @@ bt_component_class_sink_consume_method_status handle_packet_beginning_msg(
 		 */
 		if (stream->prev_packet_state.end_cs == UINT64_C(-1)) {
 			BT_COMP_LOGE("Incompatible discarded packets message "
-				"occuring before the stream's first packet: "
+				"occurring before the stream's first packet: "
 				"stream-id=%" PRIu64 ", stream-name=\"%s\", "
 				"trace-name=\"%s\", path=\"%s/%s\"",
 				bt_stream_get_id(ir_stream),
@@ -645,7 +629,7 @@ bt_component_class_sink_consume_method_status handle_stream_beginning_msg(
 	/*
 	 * Not supported: discarded events or discarded packets support
 	 * without packets support. Packets are the way to know where
-	 * discarded events/packets occured in CTF 1.8.
+	 * discarded events/packets occurred in CTF 1.8.
 	 */
 	if (!bt_stream_class_supports_packets(ir_sc)) {
 		BT_ASSERT(!bt_stream_class_supports_discarded_packets(ir_sc));
@@ -820,7 +804,7 @@ bt_component_class_sink_consume_method_status handle_discarded_events_msg(
 	if (stream->packet_state.is_open &&
 			stream->sc->discarded_events_has_ts) {
 		BT_COMP_LOGE("Unsupported discarded events message with "
-			"default clock snapshots occuring within a packet: "
+			"default clock snapshots occurring within a packet: "
 			"stream-id=%" PRIu64 ", stream-name=\"%s\", "
 			"trace-name=\"%s\", path=\"%s/%s\"",
 			bt_stream_get_id(ir_stream),
@@ -1064,12 +1048,6 @@ bt_component_class_sink_consume_method_status ctf_fs_sink_consume(
 		/* TODO: Finalize all traces (should already be done?) */
 		status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_END;
 		break;
-	case BT_MESSAGE_ITERATOR_NEXT_STATUS_MEMORY_ERROR:
-		status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_MEMORY_ERROR;
-		break;
-	case BT_MESSAGE_ITERATOR_NEXT_STATUS_ERROR:
-		status = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_MEMORY_ERROR;
-		break;
 	default:
 		break;
 	}