Add type-checked versions of allocation and deallocations functions

[lttng-tools.git] / src / common / runas.cpp

diff --git a/src/common/runas.cpp b/src/common/runas.cpp
index a87eb13cfbb182351ff14abf3bc14caf6bab71b1..6b1201deb6fc032c3dfb7cd4abcb7db6bd8e31fb 100644 (file)
--- a/src/common/runas.cpp
+++ b/src/common/runas.cpp
@@ -22,24 +22,24 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <common/bytecode/bytecode.h>
-#include <common/lttng-kernel.h>
-#include <common/common.h>
-#include <common/utils.h>
-#include <common/compat/errno.h>
-#include <common/compat/getenv.h>
-#include <common/compat/string.h>
-#include <common/unix.h>
-#include <common/defaults.h>
-#include <common/lttng-elf.h>
-#include <common/thread.h>
+#include <common/bytecode/bytecode.hpp>
+#include <common/lttng-kernel.hpp>
+#include <common/common.hpp>
+#include <common/utils.hpp>
+#include <common/compat/errno.hpp>
+#include <common/compat/getenv.hpp>
+#include <common/compat/string.hpp>
+#include <common/unix.hpp>
+#include <common/defaults.hpp>
+#include <common/lttng-elf.hpp>
+#include <common/thread.hpp>
 
 #include <lttng/constant.h>
 
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/filter/filter-ast.h>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/filter/filter-ast.hpp>
 
-#include "runas.h"
+#include "runas.hpp"
 
 #define GETPW_BUFFER_FALLBACK_SIZE 4096
 
@@ -629,16 +629,18 @@ end:
 }
 #else
 static
-int _extract_elf_symbol_offset(struct run_as_data *data,
-               struct run_as_ret *ret_value)
+int _extract_elf_symbol_offset(
+               struct run_as_data *data __attribute__((unused)),
+               struct run_as_ret *ret_value __attribute__((unused)))
 {
        ERR("Unimplemented runas command RUN_AS_EXTRACT_ELF_SYMBOL_OFFSET");
        return -1;
 }
 
 static
-int _extract_sdt_probe_offsets(struct run_as_data *data,
-               struct run_as_ret *ret_value)
+int _extract_sdt_probe_offsets(
+               struct run_as_data *data __attribute__((unused)),
+               struct run_as_ret *ret_value __attribute__((unused)))
 {
        ERR("Unimplemented runas command RUN_AS_EXTRACT_SDT_PROBE_OFFSETS");
        return -1;
@@ -928,7 +930,7 @@ static int get_user_infos_from_uid(
 
        get_pw_buf_size = (size_t) raw_get_pw_buf_size;
 
-       buf = (char *) zmalloc(get_pw_buf_size);
+       buf = calloc<char>(get_pw_buf_size);
        if (buf == NULL) {
                PERROR("Failed to allocate buffer to get password file entries");
                goto error;
@@ -1344,7 +1346,7 @@ end:
 static
 int run_as_noworker(enum run_as_cmd cmd,
                struct run_as_data *data, struct run_as_ret *ret_value,
-               uid_t uid, gid_t gid)
+               uid_t uid __attribute__((unused)), gid_t gid __attribute__((unused)))
 {
        int ret, saved_errno;
        mode_t old_mask;
@@ -1456,7 +1458,7 @@ int run_as_create_worker_no_lock(const char *procname,
                ret = 0;
                goto end;
        }
-       worker = (run_as_worker_data *) zmalloc(sizeof(*worker));
+       worker = zmalloc<run_as_worker_data>();
        if (!worker) {
                ret = -ENOMEM;
                goto end;
@@ -1957,7 +1959,7 @@ int run_as_extract_sdt_probe_offsets(int fd, const char* provider_name,
        }
 
        *num_offset = run_as_ret.u.extract_sdt_probe_offsets.num_offset;
-       *offsets = (uint64_t *) zmalloc(*num_offset * sizeof(uint64_t));
+       *offsets = calloc<uint64_t>(*num_offset);
        if (!*offsets) {
                ret = -ENOMEM;
                goto error;
@@ -1999,7 +2001,7 @@ int run_as_generate_filter_bytecode(const char *filter_expression,
 
        view_bytecode = (const struct lttng_bytecode *) run_as_ret.u.generate_filter_bytecode.bytecode;
 
-       local_bytecode = (lttng_bytecode *) zmalloc(sizeof(*local_bytecode) + view_bytecode->len);
+       local_bytecode = calloc<lttng_bytecode>(view_bytecode->len);
        if (!local_bytecode) {
                ret = -ENOMEM;
                goto error;