projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: reduce scope of dyanamically-allocated string
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 297db20ce062201630bd96ab91f268b79897916b..4c3a1796c8aa58abac502fbee00195b68c0d262d 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-2440,11
+2440,10
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
break;
case LTTNG_CONSUMER64_UST:
{
break;
case LTTNG_CONSUMER64_UST:
{
- char *tmpnew = NULL;
-
if (config.consumerd64_lib_dir.value) {
char *tmp;
size_t tmplen;
if (config.consumerd64_lib_dir.value) {
char *tmp;
size_t tmplen;
+ char *tmpnew;
tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
if (!tmp) {
tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
if (!tmp) {
@@
-2462,9
+2461,9
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
strcat(tmpnew, tmp);
}
ret = setenv("LD_LIBRARY_PATH", tmpnew, 1);
strcat(tmpnew, tmp);
}
ret = setenv("LD_LIBRARY_PATH", tmpnew, 1);
+ free(tmpnew);
if (ret) {
ret = -errno;
if (ret) {
ret = -errno;
- free(tmpnew);
goto error;
}
}
goto error;
}
}
@@
-2474,16
+2473,14
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
"--group", config.tracing_group_name.value,
NULL);
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
"--group", config.tracing_group_name.value,
NULL);
- free(tmpnew);
break;
}
case LTTNG_CONSUMER32_UST:
{
break;
}
case LTTNG_CONSUMER32_UST:
{
- char *tmpnew = NULL;
-
if (config.consumerd32_lib_dir.value) {
char *tmp;
size_t tmplen;
if (config.consumerd32_lib_dir.value) {
char *tmp;
size_t tmplen;
+ char *tmpnew;
tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
if (!tmp) {
tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
if (!tmp) {
@@
-2501,9
+2498,9
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
strcat(tmpnew, tmp);
}
ret = setenv("LD_LIBRARY_PATH", tmpnew, 1);
strcat(tmpnew, tmp);
}
ret = setenv("LD_LIBRARY_PATH", tmpnew, 1);
+ free(tmpnew);
if (ret) {
ret = -errno;
if (ret) {
ret = -errno;
- free(tmpnew);
goto error;
}
}
goto error;
}
}
@@
-2513,7
+2510,6
@@
static pid_t spawn_consumerd(struct consumer_data *consumer_data)
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
"--group", config.tracing_group_name.value,
NULL);
"--consumerd-err-sock", consumer_data->err_unix_sock_path,
"--group", config.tracing_group_name.value,
NULL);
- free(tmpnew);
break;
}
default:
break;
}
default:
This page took
0.0319430000000001 seconds
and
5
git commands to generate.