Namespace struct stream_pos

[babeltrace.git] / include / babeltrace / format.h

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index ef340da115b9432abdad0f35d6e5e94a3d23e52b..fa0e3251ad839973685816ede43a0183b6664289 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -19,6 +19,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * 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.
  */
 
 #include <babeltrace/list.h>
@@ -33,7 +41,7 @@ extern "C" {
 typedef int bt_intern_str;
 
 /* forward declaration */
-struct stream_pos;
+struct bt_stream_pos;
 struct bt_context;
 struct bt_trace_handle;
 
@@ -54,15 +62,15 @@ struct format {
        bt_intern_str name;
 
        struct trace_descriptor *(*open_trace)(const char *path, int flags,
-                       void (*packet_seek)(struct stream_pos *pos,
+                       void (*packet_seek)(struct bt_stream_pos *pos,
                                size_t index, int whence),
                        FILE *metadata_fp);
        struct trace_descriptor *(*open_mmap_trace)(
                        struct mmap_stream_list *mmap_list,
-                       void (*packet_seek)(struct stream_pos *pos,
+                       void (*packet_seek)(struct bt_stream_pos *pos,
                                size_t index, int whence),
                        FILE *metadata_fp);
-       void (*close_trace)(struct trace_descriptor *descriptor);
+       int (*close_trace)(struct trace_descriptor *descriptor);
        void (*set_context)(struct trace_descriptor *descriptor,
                        struct bt_context *ctx);
        void (*set_handle)(struct trace_descriptor *descriptor,
@@ -77,8 +85,8 @@ struct format {
 extern struct format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct format *format);
+extern void bt_unregister_format(struct format *format);
 
-/* TBD: format unregistration */
 #ifdef __cplusplus
 }
 #endif