From b8cd2bdc50fd8d10eb38c173b97b5918012271e7 Mon Sep 17 00:00:00 2001 From: vkalintiris Date: Mon, 24 May 2021 17:44:50 +0300 Subject: Remove unecessary relative paths when including headers. (#11124) Currently, we add the repository's top-level dir in the compiler's header search path. This means that code in every top-level directory within the repo can include headers sibling top-level directories. This patch makes header inclusion consistent when it comes to files that are included from sibling top-level directories within the repo. --- aclk/aclk.h | 2 +- aclk/aclk_otp.c | 4 ++-- aclk/aclk_otp.h | 2 +- aclk/aclk_query_queue.h | 2 +- aclk/aclk_rx_msgs.h | 2 +- aclk/aclk_stats.h | 2 +- aclk/aclk_tx_msgs.c | 2 +- aclk/aclk_tx_msgs.h | 2 +- aclk/aclk_util.c | 2 +- aclk/https_client.c | 2 +- aclk/legacy/aclk_common.c | 2 +- aclk/legacy/aclk_common.h | 2 +- aclk/legacy/aclk_lws_https_client.h | 2 +- aclk/legacy/aclk_lws_wss_client.c | 2 +- aclk/legacy/aclk_rrdhost_state.h | 2 +- aclk/legacy/aclk_rx_msgs.h | 2 +- aclk/legacy/aclk_stats.h | 2 +- aclk/legacy/agent_cloud_link.h | 2 +- aclk/legacy/mqtt.c | 2 +- claim/claim.c | 6 +++--- claim/claim.h | 2 +- cli/cli.c | 4 ++-- cli/cli.h | 2 +- collectors/all.h | 2 +- collectors/apps.plugin/apps_plugin.c | 2 +- collectors/cgroups.plugin/sys_fs_cgroup.h | 2 +- collectors/checks.plugin/plugin_checks.h | 2 +- collectors/cups.plugin/cups_plugin.c | 2 +- collectors/diskspace.plugin/plugin_diskspace.h | 2 +- collectors/freeipmi.plugin/freeipmi_plugin.c | 2 +- collectors/idlejitter.plugin/plugin_idlejitter.h | 2 +- collectors/macos.plugin/plugin_macos.h | 2 +- collectors/nfacct.plugin/plugin_nfacct.c | 2 +- collectors/perf.plugin/perf_plugin.c | 2 +- collectors/plugins.d/plugins_d.h | 2 +- collectors/plugins.d/pluginsd_parser.h | 2 +- collectors/proc.plugin/plugin_proc.h | 2 +- collectors/proc.plugin/zfs_common.h | 2 +- collectors/statsd.plugin/statsd.h | 2 +- collectors/tc.plugin/plugin_tc.h | 2 +- collectors/timex.plugin/plugin_timex.h | 2 +- collectors/xenstat.plugin/xenstat_plugin.c | 2 +- daemon/analytics.h | 2 +- daemon/commands.c | 2 +- daemon/common.h | 2 +- database/engine/metadata_log/metalogpluginsd.h | 6 +++--- database/engine/rrdengine.h | 2 +- database/rrd.h | 6 +++--- database/sqlite/sqlite_functions.h | 2 +- health/health.h | 2 +- parser/parser.h | 2 +- registry/registry.c | 2 +- registry/registry.h | 2 +- registry/registry_db.c | 2 +- registry/registry_init.c | 2 +- registry/registry_internals.c | 2 +- registry/registry_log.c | 2 +- registry/registry_machine.c | 2 +- registry/registry_person.c | 2 +- registry/registry_url.c | 2 +- spawn/spawn.c | 2 +- spawn/spawn.h | 2 +- spawn/spawn_client.c | 2 +- streaming/receiver.c | 2 +- streaming/rrdpush.c | 2 +- streaming/rrdpush.h | 4 ++-- web/api/queries/rrdr.h | 2 +- web/api/tests/valid_urls.c | 8 ++++---- web/api/tests/web_api.c | 8 ++++---- 69 files changed, 84 insertions(+), 84 deletions(-) diff --git a/aclk/aclk.h b/aclk/aclk.h index b02b93d758..3245f70af2 100644 --- a/aclk/aclk.h +++ b/aclk/aclk.h @@ -6,7 +6,7 @@ typedef struct aclk_rrdhost_state { char *claimed_id; // Claimed ID if host has one otherwise NULL } aclk_rrdhost_state; -#include "../daemon/common.h" +#include "daemon/common.h" #include "aclk_util.h" // version for aclk legacy (old cloud arch) diff --git a/aclk/aclk_otp.c b/aclk/aclk_otp.c index 411a5f8912..7ae6891940 100644 --- a/aclk/aclk_otp.c +++ b/aclk/aclk_otp.c @@ -3,9 +3,9 @@ #include "aclk_otp.h" -#include "../daemon/common.h" +#include "daemon/common.h" -#include "../mqtt_websockets/c-rbuf/include/ringbuffer.h" +#include "mqtt_websockets/c-rbuf/include/ringbuffer.h" // CentOS 7 has older version that doesn't define this // same goes for MacOS diff --git a/aclk/aclk_otp.h b/aclk/aclk_otp.h index d2044f6fd3..d1056742eb 100644 --- a/aclk/aclk_otp.h +++ b/aclk/aclk_otp.h @@ -3,7 +3,7 @@ #ifndef ACLK_OTP_H #define ACLK_OTP_H -#include "../daemon/common.h" +#include "daemon/common.h" #include "https_client.h" diff --git a/aclk/aclk_query_queue.h b/aclk/aclk_query_queue.h index c46513567f..050dc7d224 100644 --- a/aclk/aclk_query_queue.h +++ b/aclk/aclk_query_queue.h @@ -4,7 +4,7 @@ #define NETDATA_ACLK_QUERY_QUEUE_H #include "libnetdata/libnetdata.h" -#include "../daemon/common.h" +#include "daemon/common.h" typedef enum { UNKNOWN, diff --git a/aclk/aclk_rx_msgs.h b/aclk/aclk_rx_msgs.h index e24252bee3..21c202dee2 100644 --- a/aclk/aclk_rx_msgs.h +++ b/aclk/aclk_rx_msgs.h @@ -5,7 +5,7 @@ #ifndef ACLK_RX_MSGS_H #define ACLK_RX_MSGS_H -#include "../daemon/common.h" +#include "daemon/common.h" #include "libnetdata/libnetdata.h" int aclk_handle_cloud_message(char *payload); diff --git a/aclk/aclk_stats.h b/aclk/aclk_stats.h index 33d016965c..9936b37193 100644 --- a/aclk/aclk_stats.h +++ b/aclk/aclk_stats.h @@ -3,7 +3,7 @@ #ifndef NETDATA_ACLK_STATS_H #define NETDATA_ACLK_STATS_H -#include "../daemon/common.h" +#include "daemon/common.h" #include "libnetdata/libnetdata.h" #define ACLK_STATS_THREAD_NAME "ACLK_Stats" diff --git a/aclk/aclk_tx_msgs.c b/aclk/aclk_tx_msgs.c index 144008e4dc..462bc29569 100644 --- a/aclk/aclk_tx_msgs.c +++ b/aclk/aclk_tx_msgs.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "aclk_tx_msgs.h" -#include "../daemon/common.h" +#include "daemon/common.h" #include "aclk_util.h" #include "aclk_stats.h" diff --git a/aclk/aclk_tx_msgs.h b/aclk/aclk_tx_msgs.h index 50c9816961..9bcf7a5bc0 100644 --- a/aclk/aclk_tx_msgs.h +++ b/aclk/aclk_tx_msgs.h @@ -4,7 +4,7 @@ #include #include "libnetdata/libnetdata.h" -#include "../daemon/common.h" +#include "daemon/common.h" #include "mqtt_wss_client.h" void aclk_send_info_metadata(mqtt_wss_client client, int metadata_submitted, RRDHOST *host); diff --git a/aclk/aclk_util.c b/aclk/aclk_util.c index b8ac667560..42c223ba9c 100644 --- a/aclk/aclk_util.c +++ b/aclk/aclk_util.c @@ -4,7 +4,7 @@ #include -#include "../daemon/common.h" +#include "daemon/common.h" // CentOS 7 has older version that doesn't define this // same goes for MacOS diff --git a/aclk/https_client.c b/aclk/https_client.c index 907f512ba4..a89345a1f1 100644 --- a/aclk/https_client.c +++ b/aclk/https_client.c @@ -4,7 +4,7 @@ #include "https_client.h" -#include "../mqtt_websockets/c-rbuf/include/ringbuffer.h" +#include "mqtt_websockets/c-rbuf/include/ringbuffer.h" enum http_parse_state { HTTP_PARSE_INITIAL = 0, diff --git a/aclk/legacy/aclk_common.c b/aclk/legacy/aclk_common.c index 96f955451d..eccacf5ff0 100644 --- a/aclk/legacy/aclk_common.c +++ b/aclk/legacy/aclk_common.c @@ -1,6 +1,6 @@ #include "aclk_common.h" -#include "../../daemon/common.h" +#include "daemon/common.h" #ifdef ENABLE_ACLK #include diff --git a/aclk/legacy/aclk_common.h b/aclk/legacy/aclk_common.h index eedb5b51c9..3bcf3c6839 100644 --- a/aclk/legacy/aclk_common.h +++ b/aclk/legacy/aclk_common.h @@ -2,7 +2,7 @@ #define ACLK_COMMON_H #include "aclk_rrdhost_state.h" -#include "../../daemon/common.h" +#include "daemon/common.h" extern netdata_mutex_t aclk_shared_state_mutex; #define ACLK_SHARED_STATE_LOCK netdata_mutex_lock(&aclk_shared_state_mutex) diff --git a/aclk/legacy/aclk_lws_https_client.h b/aclk/legacy/aclk_lws_https_client.h index 811809dd1a..5f30a37fda 100644 --- a/aclk/legacy/aclk_lws_https_client.h +++ b/aclk/legacy/aclk_lws_https_client.h @@ -3,7 +3,7 @@ #ifndef NETDATA_LWS_HTTPS_CLIENT_H #define NETDATA_LWS_HTTPS_CLIENT_H -#include "../../daemon/common.h" +#include "daemon/common.h" #include "libnetdata/libnetdata.h" #define DATAMAXLEN 1024*16 diff --git a/aclk/legacy/aclk_lws_wss_client.c b/aclk/legacy/aclk_lws_wss_client.c index f73902b30c..1402301d67 100644 --- a/aclk/legacy/aclk_lws_wss_client.c +++ b/aclk/legacy/aclk_lws_wss_client.c @@ -3,7 +3,7 @@ #include "aclk_lws_wss_client.h" #include "libnetdata/libnetdata.h" -#include "../../daemon/common.h" +#include "daemon/common.h" #include "aclk_common.h" #include "aclk_stats.h" diff --git a/aclk/legacy/aclk_rrdhost_state.h b/aclk/legacy/aclk_rrdhost_state.h index 7ab3a502e5..485e8cbba6 100644 --- a/aclk/legacy/aclk_rrdhost_state.h +++ b/aclk/legacy/aclk_rrdhost_state.h @@ -1,7 +1,7 @@ #ifndef ACLK_RRDHOST_STATE_H #define ACLK_RRDHOST_STATE_H -#include "../../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" typedef enum aclk_cmd { ACLK_CMD_CLOUD, diff --git a/aclk/legacy/aclk_rx_msgs.h b/aclk/legacy/aclk_rx_msgs.h index 3095e41a73..fd36b902f9 100644 --- a/aclk/legacy/aclk_rx_msgs.h +++ b/aclk/legacy/aclk_rx_msgs.h @@ -3,7 +3,7 @@ #ifndef NETDATA_ACLK_RX_MSGS_H #define NETDATA_ACLK_RX_MSGS_H -#include "../../daemon/common.h" +#include "daemon/common.h" #include "libnetdata/libnetdata.h" int aclk_handle_cloud_message(char *payload); diff --git a/aclk/legacy/aclk_stats.h b/aclk/legacy/aclk_stats.h index 5e50a2272a..1709340524 100644 --- a/aclk/legacy/aclk_stats.h +++ b/aclk/legacy/aclk_stats.h @@ -3,7 +3,7 @@ #ifndef NETDATA_ACLK_STATS_H #define NETDATA_ACLK_STATS_H -#include "../../daemon/common.h" +#include "daemon/common.h" #include "libnetdata/libnetdata.h" #include "aclk_common.h" diff --git a/aclk/legacy/agent_cloud_link.h b/aclk/legacy/agent_cloud_link.h index bfcfef8e98..b304433b7b 100644 --- a/aclk/legacy/agent_cloud_link.h +++ b/aclk/legacy/agent_cloud_link.h @@ -3,7 +3,7 @@ #ifndef NETDATA_AGENT_CLOUD_LINK_H #define NETDATA_AGENT_CLOUD_LINK_H -#include "../../daemon/common.h" +#include "daemon/common.h" #include "mqtt.h" #include "aclk_common.h" diff --git a/aclk/legacy/mqtt.c b/aclk/legacy/mqtt.c index 74f7745554..2a2e7cea3b 100644 --- a/aclk/legacy/mqtt.c +++ b/aclk/legacy/mqtt.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include -#include "../../daemon/common.h" +#include "daemon/common.h" #include "mqtt.h" #include "aclk_lws_wss_client.h" #include "aclk_stats.h" diff --git a/claim/claim.c b/claim/claim.c index ce3f0803de..04d8efbb45 100644 --- a/claim/claim.c +++ b/claim/claim.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "claim.h" -#include "../registry/registry_internals.h" +#include "registry/registry_internals.h" #ifndef ACLK_NG -#include "../aclk/legacy/aclk_common.h" +#include "aclk/legacy/aclk_common.h" #else -#include "../aclk/aclk.h" +#include "aclk/aclk.h" #endif char *claiming_pending_arguments = NULL; diff --git a/claim/claim.h b/claim/claim.h index 2fd8d3e9bf..171cc1fab1 100644 --- a/claim/claim.h +++ b/claim/claim.h @@ -3,7 +3,7 @@ #ifndef NETDATA_CLAIM_H #define NETDATA_CLAIM_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" extern char *claiming_pending_arguments; extern struct config cloud_config; diff --git a/cli/cli.c b/cli/cli.c index 4df0201787..229ad2952d 100644 --- a/cli/cli.c +++ b/cli/cli.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "cli.h" -#include "../libnetdata/required_dummies.h" +#include "libnetdata/required_dummies.h" static uv_pipe_t client_pipe; static uv_write_t write_req; @@ -198,4 +198,4 @@ int main(int argc, char **argv) uv_close((uv_handle_t *)&client_pipe, NULL); return exit_status; -} \ No newline at end of file +} diff --git a/cli/cli.h b/cli/cli.h index 9e730a3019..056e998622 100644 --- a/cli/cli.h +++ b/cli/cli.h @@ -3,6 +3,6 @@ #ifndef NETDATA_CLI_H #define NETDATA_CLI_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" #endif //NETDATA_CLI_H diff --git a/collectors/all.h b/collectors/all.h index 4193afe6ab..1817c4cae0 100644 --- a/collectors/all.h +++ b/collectors/all.h @@ -3,7 +3,7 @@ #ifndef NETDATA_ALL_H #define NETDATA_ALL_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" // netdata internal data collection plugins diff --git a/collectors/apps.plugin/apps_plugin.c b/collectors/apps.plugin/apps_plugin.c index 4d4626e6b9..7f48f6702c 100644 --- a/collectors/apps.plugin/apps_plugin.c +++ b/collectors/apps.plugin/apps_plugin.c @@ -6,7 +6,7 @@ * Released under GPL v3+ */ -#include "../../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" // ---------------------------------------------------------------------------- diff --git a/collectors/cgroups.plugin/sys_fs_cgroup.h b/collectors/cgroups.plugin/sys_fs_cgroup.h index 155330ff1b..e382fe7d20 100644 --- a/collectors/cgroups.plugin/sys_fs_cgroup.h +++ b/collectors/cgroups.plugin/sys_fs_cgroup.h @@ -3,7 +3,7 @@ #ifndef NETDATA_SYS_FS_CGROUP_H #define NETDATA_SYS_FS_CGROUP_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #if (TARGET_OS == OS_LINUX) diff --git a/collectors/checks.plugin/plugin_checks.h b/collectors/checks.plugin/plugin_checks.h index 93494765d7..c8057253cb 100644 --- a/collectors/checks.plugin/plugin_checks.h +++ b/collectors/checks.plugin/plugin_checks.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGIN_CHECKS_H #define NETDATA_PLUGIN_CHECKS_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #ifdef NETDATA_INTERNAL_CHECKS diff --git a/collectors/cups.plugin/cups_plugin.c b/collectors/cups.plugin/cups_plugin.c index 25d6f8cb59..1d493619ed 100644 --- a/collectors/cups.plugin/cups_plugin.c +++ b/collectors/cups.plugin/cups_plugin.c @@ -6,7 +6,7 @@ * Released under GPL v3+ */ -#include "../../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" #include #include diff --git a/collectors/diskspace.plugin/plugin_diskspace.h b/collectors/diskspace.plugin/plugin_diskspace.h index 7c9df9d139..1f96708796 100644 --- a/collectors/diskspace.plugin/plugin_diskspace.h +++ b/collectors/diskspace.plugin/plugin_diskspace.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGIN_PROC_DISKSPACE_H #define NETDATA_PLUGIN_PROC_DISKSPACE_H -#include "../../daemon/common.h" +#include "daemon/common.h" #if (TARGET_OS == OS_LINUX) diff --git a/collectors/freeipmi.plugin/freeipmi_plugin.c b/collectors/freeipmi.plugin/freeipmi_plugin.c index e9702e785e..0141a6a783 100644 --- a/collectors/freeipmi.plugin/freeipmi_plugin.c +++ b/collectors/freeipmi.plugin/freeipmi_plugin.c @@ -15,7 +15,7 @@ * UCRL-CODE-222073 */ -#include "../../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" #include #include diff --git a/collectors/idlejitter.plugin/plugin_idlejitter.h b/collectors/idlejitter.plugin/plugin_idlejitter.h index 62fabea168..6da78a085f 100644 --- a/collectors/idlejitter.plugin/plugin_idlejitter.h +++ b/collectors/idlejitter.plugin/plugin_idlejitter.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGIN_IDLEJITTER_H #define NETDATA_PLUGIN_IDLEJITTER_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #define NETDATA_PLUGIN_HOOK_IDLEJITTER \ { \ diff --git a/collectors/macos.plugin/plugin_macos.h b/collectors/macos.plugin/plugin_macos.h index 0815c59c31..a66ec08523 100644 --- a/collectors/macos.plugin/plugin_macos.h +++ b/collectors/macos.plugin/plugin_macos.h @@ -4,7 +4,7 @@ #ifndef NETDATA_PLUGIN_MACOS_H #define NETDATA_PLUGIN_MACOS_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #if (TARGET_OS == OS_MACOS) diff --git a/collectors/nfacct.plugin/plugin_nfacct.c b/collectors/nfacct.plugin/plugin_nfacct.c index acdd0586d9..7876c231f2 100644 --- a/collectors/nfacct.plugin/plugin_nfacct.c +++ b/collectors/nfacct.plugin/plugin_nfacct.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" #include #include #include diff --git a/collectors/perf.plugin/perf_plugin.c b/collectors/perf.plugin/perf_plugin.c index 135e779845..87a7ccf04f 100644 --- a/collectors/perf.plugin/perf_plugin.c +++ b/collectors/perf.plugin/perf_plugin.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" #include diff --git a/collectors/plugins.d/plugins_d.h b/collectors/plugins.d/plugins_d.h index fd99b35843..b9e30e12b1 100644 --- a/collectors/plugins.d/plugins_d.h +++ b/collectors/plugins.d/plugins_d.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGINS_D_H #define NETDATA_PLUGINS_D_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #define NETDATA_PLUGIN_HOOK_PLUGINSD \ { \ diff --git a/collectors/plugins.d/pluginsd_parser.h b/collectors/plugins.d/pluginsd_parser.h index 61e9c9babb..4b94c53aca 100644 --- a/collectors/plugins.d/pluginsd_parser.h +++ b/collectors/plugins.d/pluginsd_parser.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGINSD_PARSER_H #define NETDATA_PLUGINSD_PARSER_H -#include "../../parser/parser.h" +#include "parser/parser.h" typedef struct parser_user_object { diff --git a/collectors/proc.plugin/plugin_proc.h b/collectors/proc.plugin/plugin_proc.h index b0d60cd86d..18714b548e 100644 --- a/collectors/proc.plugin/plugin_proc.h +++ b/collectors/proc.plugin/plugin_proc.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGIN_PROC_H #define NETDATA_PLUGIN_PROC_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #if (TARGET_OS == OS_LINUX) diff --git a/collectors/proc.plugin/zfs_common.h b/collectors/proc.plugin/zfs_common.h index 148f9e474d..9d61de2f3e 100644 --- a/collectors/proc.plugin/zfs_common.h +++ b/collectors/proc.plugin/zfs_common.h @@ -3,7 +3,7 @@ #ifndef NETDATA_ZFS_COMMON_H #define NETDATA_ZFS_COMMON_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #define ZFS_FAMILY_SIZE "size" #define ZFS_FAMILY_EFFICIENCY "efficiency" diff --git a/collectors/statsd.plugin/statsd.h b/collectors/statsd.plugin/statsd.h index b741be76d4..37d6a08b3e 100644 --- a/collectors/statsd.plugin/statsd.h +++ b/collectors/statsd.plugin/statsd.h @@ -3,7 +3,7 @@ #ifndef NETDATA_STATSD_H #define NETDATA_STATSD_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #define STATSD_LISTEN_PORT 8125 #define STATSD_LISTEN_BACKLOG 4096 diff --git a/collectors/tc.plugin/plugin_tc.h b/collectors/tc.plugin/plugin_tc.h index c646584152..d51fcf6744 100644 --- a/collectors/tc.plugin/plugin_tc.h +++ b/collectors/tc.plugin/plugin_tc.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGIN_TC_H #define NETDATA_PLUGIN_TC_H 1 -#include "../../daemon/common.h" +#include "daemon/common.h" #if (TARGET_OS == OS_LINUX) diff --git a/collectors/timex.plugin/plugin_timex.h b/collectors/timex.plugin/plugin_timex.h index 6025641a35..f837861633 100644 --- a/collectors/timex.plugin/plugin_timex.h +++ b/collectors/timex.plugin/plugin_timex.h @@ -3,7 +3,7 @@ #ifndef NETDATA_PLUGIN_TIMEX_H #define NETDATA_PLUGIN_TIMEX_H -#include "../../daemon/common.h" +#include "daemon/common.h" #if (TARGET_OS == OS_LINUX) diff --git a/collectors/xenstat.plugin/xenstat_plugin.c b/collectors/xenstat.plugin/xenstat_plugin.c index a322dd1c11..abcb5a1c3a 100644 --- a/collectors/xenstat.plugin/xenstat_plugin.c +++ b/collectors/xenstat.plugin/xenstat_plugin.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" #include #include diff --git a/daemon/analytics.h b/daemon/analytics.h index e888297df5..9eb47bd195 100644 --- a/daemon/analytics.h +++ b/daemon/analytics.h @@ -3,7 +3,7 @@ #ifndef NETDATA_ANALYTICS_H #define NETDATA_ANALYTICS_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" /* Max number of seconds before the first META analytics is sent */ #define ANALYTICS_INIT_SLEEP_SEC 120 diff --git a/daemon/commands.c b/daemon/commands.c index eac392e33a..3662f4c679 100644 --- a/daemon/commands.c +++ b/daemon/commands.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "common.h" -#include "../database/engine/rrdenginelib.h" +#include "database/engine/rrdenginelib.h" static uv_thread_t thread; static uv_loop_t* loop; diff --git a/daemon/common.h b/daemon/common.h index 4cb54010c0..df18f47660 100644 --- a/daemon/common.h +++ b/daemon/common.h @@ -3,7 +3,7 @@ #ifndef NETDATA_COMMON_H #define NETDATA_COMMON_H 1 -#include "../libnetdata/libnetdata.h" +#include "libnetdata/libnetdata.h" // ---------------------------------------------------------------------------- // shortcuts for the default netdata configuration diff --git a/database/engine/metadata_log/metalogpluginsd.h b/database/engine/metadata_log/metalogpluginsd.h index 96808aaa2c..4fd8c3900a 100644 --- a/database/engine/metadata_log/metalogpluginsd.h +++ b/database/engine/metadata_log/metalogpluginsd.h @@ -3,9 +3,9 @@ #ifndef NETDATA_METALOGPLUGINSD_H #define NETDATA_METALOGPLUGINSD_H -#include "../../../collectors/plugins.d/pluginsd_parser.h" -#include "../../../collectors/plugins.d/plugins_d.h" -#include "../../../parser/parser.h" +#include "collectors/plugins.d/pluginsd_parser.h" +#include "collectors/plugins.d/plugins_d.h" +#include "parser/parser.h" struct metalog_pluginsd_state { struct metalog_instance *ctx; diff --git a/database/engine/rrdengine.h b/database/engine/rrdengine.h index 07cc1479d4..b0c8e4d02d 100644 --- a/database/engine/rrdengine.h +++ b/database/engine/rrdengine.h @@ -11,7 +11,7 @@ #include #include #include -#include "../../daemon/common.h" +#include "daemon/common.h" #include "../rrd.h" #include "rrddiskprotocol.h" #include "rrdenginelib.h" diff --git a/database/rrd.h b/database/rrd.h index 380ccb161f..985d4032ec 100644 --- a/database/rrd.h +++ b/database/rrd.h @@ -26,17 +26,17 @@ struct rrdengine_instance; struct pg_cache_page_index; #endif -#include "../daemon/common.h" +#include "daemon/common.h" #include "web/api/queries/query.h" #include "rrdvar.h" #include "rrdsetvar.h" #include "rrddimvar.h" #include "rrdcalc.h" #include "rrdcalctemplate.h" -#include "../streaming/rrdpush.h" +#include "streaming/rrdpush.h" #ifndef ACLK_NG -#include "../aclk/legacy/aclk_rrdhost_state.h" +#include "aclk/legacy/aclk_rrdhost_state.h" #else #include "aclk/aclk.h" #endif diff --git a/database/sqlite/sqlite_functions.h b/database/sqlite/sqlite_functions.h index 30a52bf734..b5a435674f 100644 --- a/database/sqlite/sqlite_functions.h +++ b/database/sqlite/sqlite_functions.h @@ -3,7 +3,7 @@ #ifndef NETDATA_SQLITE_FUNCTIONS_H #define NETDATA_SQLITE_FUNCTIONS_H -#include "../../daemon/common.h" +#include "daemon/common.h" #include "sqlite3.h" // return a node list diff --git a/health/health.h b/health/health.h index 56331b2278..0a6d3e0dc9 100644 --- a/health/health.h +++ b/health/health.h @@ -3,7 +3,7 @@ #ifndef NETDATA_HEALTH_H #define NETDATA_HEALTH_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" #define NETDATA_PLUGIN_HOOK_HEALTH \ { \ diff --git a/parser/parser.h b/parser/parser.h index 86a837e803..0b78775e1e 100644 --- a/parser/parser.h +++ b/parser/parser.h @@ -3,7 +3,7 @@ #ifndef NETDATA_INCREMENTAL_PARSER_H #define NETDATA_INCREMENTAL_PARSER_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" #define PARSER_MAX_CALLBACKS 20 #define PARSER_MAX_RECOVER_KEYWORDS 128 diff --git a/registry/registry.c b/registry/registry.c index 37a3113901..64053fe25f 100644 --- a/registry/registry.c +++ b/registry/registry.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" #define REGISTRY_STATUS_OK "ok" diff --git a/registry/registry.h b/registry/registry.h index 44095c237e..5e274487da 100644 --- a/registry/registry.h +++ b/registry/registry.h @@ -49,7 +49,7 @@ #ifndef NETDATA_REGISTRY_H #define NETDATA_REGISTRY_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" #define NETDATA_REGISTRY_COOKIE_NAME "netdata_registry_id" diff --git a/registry/registry_db.c b/registry/registry_db.c index d8e2bbd8dd..c61a225ccf 100644 --- a/registry/registry_db.c +++ b/registry/registry_db.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" int registry_db_should_be_saved(void) { diff --git a/registry/registry_init.c b/registry/registry_init.c index 36673ff0f0..d07daefa5b 100644 --- a/registry/registry_init.c +++ b/registry/registry_init.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" int registry_init(void) { diff --git a/registry/registry_internals.c b/registry/registry_internals.c index 3de6dd17b8..cffe3f21d7 100644 --- a/registry/registry_internals.c +++ b/registry/registry_internals.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" struct registry registry; diff --git a/registry/registry_log.c b/registry/registry_log.c index e0e58ede35..b048135e60 100644 --- a/registry/registry_log.c +++ b/registry/registry_log.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" void registry_log(char action, REGISTRY_PERSON *p, REGISTRY_MACHINE *m, REGISTRY_URL *u, char *name) { diff --git a/registry/registry_machine.c b/registry/registry_machine.c index 8dbeb8ea6b..bd1d243a01 100644 --- a/registry/registry_machine.c +++ b/registry/registry_machine.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" // ---------------------------------------------------------------------------- diff --git a/registry/registry_person.c b/registry/registry_person.c index fae1520c4f..acf9d4da27 100644 --- a/registry/registry_person.c +++ b/registry/registry_person.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" // ---------------------------------------------------------------------------- diff --git a/registry/registry_url.c b/registry/registry_url.c index 559799d8fe..699e5e6800 100644 --- a/registry/registry_url.c +++ b/registry/registry_url.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../daemon/common.h" +#include "daemon/common.h" #include "registry_internals.h" // ---------------------------------------------------------------------------- diff --git a/spawn/spawn.c b/spawn/spawn.c index e416a96b43..46853ecb91 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 6a44143389..a9f1a07441 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 83dc3c80df..01509ae06d 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; diff --git a/streaming/receiver.c b/streaming/receiver.c index 11191f3c78..e1639e3799 100644 --- a/streaming/receiver.c +++ b/streaming/receiver.c @@ -49,7 +49,7 @@ static void rrdpush_receiver_thread_cleanup(void *ptr) { } } -#include "../collectors/plugins.d/pluginsd_parser.h" +#include "collectors/plugins.d/pluginsd_parser.h" PARSER_RC streaming_timestamp(char **words, void *user, PLUGINSD_ACTION *plugins_action) { diff --git a/streaming/rrdpush.c b/streaming/rrdpush.c index f54fc609ee..27fcddbb09 100644 --- a/streaming/rrdpush.c +++ b/streaming/rrdpush.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "rrdpush.h" -#include "../parser/parser.h" +#include "parser/parser.h" /* * rrdpush diff --git a/streaming/rrdpush.h b/streaming/rrdpush.h index 225d0c2992..959c3cc60e 100644 --- a/streaming/rrdpush.h +++ b/streaming/rrdpush.h @@ -3,8 +3,8 @@ #ifndef NETDATA_RRDPUSH_H #define NETDATA_RRDPUSH_H 1 -#include "../database/rrd.h" -#include "../libnetdata/libnetdata.h" +#include "database/rrd.h" +#include "libnetdata/libnetdata.h" #include "web/server/web_client.h" #include "daemon/common.h" diff --git a/web/api/queries/rrdr.h b/web/api/queries/rrdr.h index b302f8bd40..e6a5d864a6 100644 --- a/web/api/queries/rrdr.h +++ b/web/api/queries/rrdr.h @@ -99,7 +99,7 @@ typedef struct rrdresult { #define rrdr_rows(r) ((r)->rows) -#include "../../../database/rrd.h" +#include "database/rrd.h" extern void rrdr_free(RRDR *r); extern RRDR *rrdr_create(struct rrdset *st, long n, struct context_param *context_param_list); diff --git a/web/api/tests/valid_urls.c b/web/api/tests/valid_urls.c index d8c261c510..a4bda633d4 100644 --- a/web/api/tests/valid_urls.c +++ b/web/api/tests/valid_urls.c @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../../../libnetdata/libnetdata.h" -#include "../../../libnetdata/required_dummies.h" -#include "../../../database/rrd.h" -#include "../../../web/server/web_client.h" +#include "libnetdata/libnetdata.h" +#include "libnetdata/required_dummies.h" +#include "database/rrd.h" +#include "web/server/web_client.h" #include #include #include diff --git a/web/api/tests/web_api.c b/web/api/tests/web_api.c index 0a741e0842..b96213255b 100644 --- a/web/api/tests/web_api.c +++ b/web/api/tests/web_api.c @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "../../../libnetdata/libnetdata.h" -#include "../../../libnetdata/required_dummies.h" -#include "../../../database/rrd.h" -#include "../../../web/server/web_client.h" +#include "libnetdata/libnetdata.h" +#include "libnetdata/required_dummies.h" +#include "database/rrd.h" +#include "web/server/web_client.h" #include #include #include -- cgit v1.2.3