X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fcontext.c;h=dca4cb2b4fc4605735f795872570ae34456c82b7;hp=373944c20c2144fd0e0d0ab20a56578f635cc641;hb=b4b292cc76e04e9efda111e492251d8e7aefe451;hpb=03798a93f959f6c694fe98f5647481947607c604

diff --git a/lib/context.c b/lib/context.c
index 373944c2..dca4cb2b 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <errno.h>
 
 #include <fts.h>
 #include <fcntl.h> /* For O_RDONLY */
@@ -69,6 +70,9 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	struct bt_trace_handle *handle;
 	int ret;
 
+	if (!ctx || !format_name || (!path && !stream_list))
+		return -EINVAL;
+
 	fmt = bt_lookup_format(g_quark_from_string(format_name));
 	if (!fmt) {
 		fprintf(stderr, "[error] [Context] Format \"%s\" unknown.\n\n",
@@ -104,8 +108,10 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	}
 	handle->format = fmt;
 	handle->td = td;
-	strncpy(handle->path, path, PATH_MAX);
-	handle->path[PATH_MAX - 1] = '\0';
+	if (path) {
+		strncpy(handle->path, path, PATH_MAX);
+		handle->path[PATH_MAX - 1] = '\0';
+	}
 
 	if (fmt->set_handle)
 		fmt->set_handle(td, handle);
@@ -134,13 +140,17 @@ end:
 	return ret;
 }
 
-void bt_context_remove_trace(struct bt_context *ctx, int handle_id)
+int bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 {
 	struct bt_trace_handle *handle;
 
+	if (!ctx)
+		return -EINVAL;
+
 	handle = g_hash_table_lookup(ctx->trace_handles,
 		(gpointer) (unsigned long) handle_id);
-	assert(handle != NULL);
+	if (!handle)
+		return -ENOENT;
 
 	/* Remove from containers */
 	trace_collection_remove(ctx->tc, handle->td);
@@ -150,12 +160,13 @@ void bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 	/* Remove and free the handle */
 	g_hash_table_remove(ctx->trace_handles,
 			(gpointer) (unsigned long) handle_id);
-
+	return 0;
 }
 
 static
 void bt_context_destroy(struct bt_context *ctx)
 {
+	assert(ctx);
 	finalize_trace_collection(ctx->tc);
 
 	/* Remote all traces. The g_hash_table_destroy will call
@@ -171,11 +182,13 @@ void bt_context_destroy(struct bt_context *ctx)
 
 void bt_context_get(struct bt_context *ctx)
 {
+	assert(ctx);
 	ctx->refcount++;
 }
 
 void bt_context_put(struct bt_context *ctx)
 {
+	assert(ctx);
 	ctx->refcount--;
 	if (ctx->refcount == 0)
 		bt_context_destroy(ctx);