summaryrefslogtreecommitdiffstats
path: root/spawn
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
commit483926a283e118590da3f9ecfa75a8a4d62143ce (patch)
treecb77052778df9a128a8cd3ff5bf7645322a13bc5 /spawn
parentReleasing debian version 1.31.0-4. (diff)
downloadnetdata-483926a283e118590da3f9ecfa75a8a4d62143ce.tar.xz
netdata-483926a283e118590da3f9ecfa75a8a4d62143ce.zip
Merging upstream version 1.32.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'spawn')
-rw-r--r--spawn/spawn.c2
-rw-r--r--spawn/spawn.h2
-rw-r--r--spawn/spawn_client.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/spawn/spawn.c b/spawn/spawn.c
index e416a96b4..46853ecb9 100644
--- a/spawn/spawn.c
+++ b/spawn/spawn.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#include "spawn.h"
-#include "../database/engine/rrdenginelib.h"
+#include "database/engine/rrdenginelib.h"
static uv_thread_t thread;
int spawn_thread_error;
diff --git a/spawn/spawn.h b/spawn/spawn.h
index 6a4414338..a9f1a0744 100644
--- a/spawn/spawn.h
+++ b/spawn/spawn.h
@@ -3,7 +3,7 @@
#ifndef NETDATA_SPAWN_H
#define NETDATA_SPAWN_H 1
-#include "../daemon/common.h"
+#include "daemon/common.h"
#define SPAWN_SERVER_COMMAND_LINE_ARGUMENT "--special-spawn-server"
diff --git a/spawn/spawn_client.c b/spawn/spawn_client.c
index 83dc3c80d..59f1ccb05 100644
--- a/spawn/spawn_client.c
+++ b/spawn/spawn_client.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#include "spawn.h"
-#include "../database/engine/rrdenginelib.h"
+#include "database/engine/rrdenginelib.h"
static uv_process_t process;
static uv_pipe_t spawn_channel;
@@ -139,7 +139,7 @@ static void spawn_process_cmd(struct spawn_cmd_info *cmdinfo)
uv_buf_t writebuf[3];
struct write_context *write_ctx;
- write_ctx = mallocz(sizeof(*write_ctx));
+ write_ctx = callocz(1, sizeof(*write_ctx));
write_ctx->write_req.data = write_ctx;
uv_mutex_lock(&cmdinfo->mutex);