X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffd-tracker%2Ffd-tracker.cpp;h=398ec971ddd5fdf5c8e0ff61e987efbad3ac1432;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=9c6f031b0b6dc6e4995dde7d72f50fc158c06824;hpb=60f1b42d6280b6bd386abb726dca4fd3b31d8491;p=lttng-tools.git

diff --git a/src/common/fd-tracker/fd-tracker.cpp b/src/common/fd-tracker/fd-tracker.cpp
index 9c6f031b0..398ec971d 100644
--- a/src/common/fd-tracker/fd-tracker.cpp
+++ b/src/common/fd-tracker/fd-tracker.cpp
@@ -188,7 +188,7 @@ static void unsuspendable_fd_destroy(struct unsuspendable_fd *entry)
 static struct unsuspendable_fd *unsuspendable_fd_create(
 		const char *name, int fd)
 {
-	struct unsuspendable_fd *entry = (unsuspendable_fd *) zmalloc(sizeof(*entry));
+	struct unsuspendable_fd *entry = zmalloc<unsuspendable_fd>();
 
 	if (!entry) {
 		goto error;
@@ -365,7 +365,7 @@ end:
 struct fd_tracker *fd_tracker_create(const char *unlinked_file_path,
 		unsigned int capacity)
 {
-	struct fd_tracker *tracker = (fd_tracker *) zmalloc(sizeof(struct fd_tracker));
+	struct fd_tracker *tracker = zmalloc<fd_tracker>();
 
 	if (!tracker) {
 		goto end;
@@ -526,7 +526,7 @@ struct fs_handle *fd_tracker_open_fs_handle(struct fd_tracker *tracker,
 		}
 	}
 
-	handle = (fs_handle_tracked *) zmalloc(sizeof(*handle));
+	handle = zmalloc<fs_handle_tracked>();
 	if (!handle) {
 		goto end;
 	}
@@ -620,7 +620,7 @@ int fd_tracker_open_unsuspendable_fd(struct fd_tracker *tracker,
 	unsigned int active_fds;
 	struct unsuspendable_fd **entries;
 
-	entries = (unsuspendable_fd **) zmalloc(fd_count * sizeof(*entries));
+	entries = calloc<unsuspendable_fd *>(fd_count);
 	if (!entries) {
 		ret = -1;
 		goto end;
@@ -719,7 +719,7 @@ int fd_tracker_close_unsuspendable_fd(struct fd_tracker *tracker,
 	 * Maintain a local copy of fds_in as the user's callback may modify its
 	 * contents (e.g. setting the fd(s) to -1 after close).
 	 */
-	fds = (int *) malloc(sizeof(*fds) * fd_count);
+	fds = malloc<int>(sizeof(*fds) * fd_count);
 	if (!fds) {
 		ret = -1;
 		goto end;