projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add type-checked versions of allocation and deallocations functions
[lttng-tools.git]
/
src
/
common
/
spawn-viewer.cpp
diff --git
a/src/common/spawn-viewer.cpp
b/src/common/spawn-viewer.cpp
index bcbc229a2f2760e83b2fe27fbe34193a50d16910..288e3a2ae6b60beb404bf6248e509d9370d6aef1 100644
(file)
--- a/
src/common/spawn-viewer.cpp
+++ b/
src/common/spawn-viewer.cpp
@@
-1,9
+1,9
@@
/*
/*
- * Copyright (C) 2011
David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011
EfficiOS Inc.
* Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2020 Francis Deslauriers <francis.deslauriers@efficios.com>
*
* Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2020 Francis Deslauriers <francis.deslauriers@efficios.com>
*
- * SPDX-License-Identifier:
GPL-2.0
-only
+ * SPDX-License-Identifier:
LGPL-2.1
-only
*
*/
*
*/
@@
-14,10
+14,10
@@
#include <lttng/constant.h>
#include <lttng/constant.h>
-#include <common/compat/errno.h>
-#include "error.h"
-#include "macros.h"
-#include "spawn-viewer.h"
+#include <common/compat/errno.h
pp
>
+#include "error.h
pp
"
+#include "macros.h
pp
"
+#include "spawn-viewer.h
pp
"
static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN;
static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN;
@@
-85,7
+85,7
@@
static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
} while (*token != '\0');
/* Add two here for the NULL terminating element and trace path */
} while (*token != '\0');
/* Add two here for the NULL terminating element and trace path */
- argv =
(char **) zmalloc(sizeof(char *) * (num_opts + 2)
);
+ argv =
calloc<char *>(num_opts + 2
);
if (argv == NULL) {
goto error;
}
if (argv == NULL) {
goto error;
}
@@
-126,7
+126,7
@@
static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
const char *trace_path, bool opt_live_mode)
{
char **argv;
const char *trace_path, bool opt_live_mode)
{
char **argv;
- size_t
size,
mem_len;
+ size_t mem_len;
/* Add one for the NULL terminating element. */
mem_len = opts_len + 1;
/* Add one for the NULL terminating element. */
mem_len = opts_len + 1;
@@
-138,10
+138,7
@@
static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
mem_len += 1;
}
mem_len += 1;
}
- size = sizeof(char *) * mem_len;
-
- /* Add two here for the trace_path and the NULL terminating element. */
- argv = (char **) zmalloc(size);
+ argv = calloc<char *>(mem_len);
if (argv == NULL) {
goto error;
}
if (argv == NULL) {
goto error;
}
This page took
0.025656 seconds
and
4
git commands to generate.