diff options
author | vkalintiris <vasilis@netdata.cloud> | 2021-05-24 17:44:50 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-24 17:44:50 +0300 |
commit | b8cd2bdc50fd8d10eb38c173b97b5918012271e7 (patch) | |
tree | 90f955325e16371e9dbab011e64b5ef8293179b8 | |
parent | 277e4f10bc47bfc5f48a6f62adea5c3fac45208e (diff) |
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.
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 <json-c/json.h> #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 <stdio.h> -#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 <libwebsockets.h> 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 <libnetdata/json/json.h> -#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; @@ -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 +} @@ -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 <cups/cups.h> #include <limits.h> 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 <stdio.h> #include <stdlib.h> 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" |