X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.cpp;h=2d12216d0ed7ceee52526a316c8c502a2116c993;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=2bf1a39623d4ac6700ac48f99bdea254786a1dc1;hpb=60f1b42d6280b6bd386abb726dca4fd3b31d8491;p=lttng-tools.git

diff --git a/src/common/trace-chunk.cpp b/src/common/trace-chunk.cpp
index 2bf1a3962..2d12216d0 100644
--- a/src/common/trace-chunk.cpp
+++ b/src/common/trace-chunk.cpp
@@ -203,7 +203,7 @@ struct fs_handle *fs_handle_untracked_create(
 		goto end;
 	}
 
-	handle = (fs_handle_untracked *) zmalloc(sizeof(typeof(*handle)));
+	handle = zmalloc<fs_handle_untracked>();
 	if (!handle) {
 		PERROR("Failed to allocate untracked filesystem handle");
 		goto end;
@@ -346,7 +346,7 @@ char *generate_chunk_name(uint64_t chunk_id, time_t creation_timestamp,
 			goto error;
 		}
 	}
-	new_name = (char *) zmalloc(GENERATED_CHUNK_NAME_LEN);
+	new_name = calloc<char>(GENERATED_CHUNK_NAME_LEN);
 	if (!new_name) {
 		ERR("Failed to allocate buffer for automatically-generated trace chunk name");
 		goto error;
@@ -399,7 +399,7 @@ struct lttng_trace_chunk *lttng_trace_chunk_allocate(void)
 {
 	struct lttng_trace_chunk *chunk = NULL;
 
-	chunk = (lttng_trace_chunk *) zmalloc(sizeof(*chunk));
+	chunk = zmalloc<lttng_trace_chunk>();
 	if (!chunk) {
 		ERR("Failed to allocate trace chunk");
 		goto end;
@@ -1930,7 +1930,7 @@ struct lttng_trace_chunk_registry *lttng_trace_chunk_registry_create(void)
 {
 	struct lttng_trace_chunk_registry *registry;
 
-	registry = (lttng_trace_chunk_registry *) zmalloc(sizeof(*registry));
+	registry = zmalloc<lttng_trace_chunk_registry>();
 	if (!registry) {
 		goto end;
 	}
@@ -1966,7 +1966,7 @@ lttng_trace_chunk_registry_element_create_from_chunk(
 		struct lttng_trace_chunk *chunk, uint64_t session_id)
 {
 	struct lttng_trace_chunk_registry_element *element =
-		(lttng_trace_chunk_registry_element *) zmalloc(sizeof(*element));
+		zmalloc<lttng_trace_chunk_registry_element>();
 
 	if (!element) {
 		goto end;