diff options
| author |   Olivier Roques <oroques+fdio@cisco.com> | 2020-11-19 09:36:59 +0000 |
|---|---|---|
| committer |   Mauro Sardara <msardara@cisco.com> | 2021-01-19 13:11:04 +0000 |
| commit | 12085f96264835de7fb2fb607e57edcef603346c (patch) | |
| tree | 51887fe8e2660a9cc6591f66aa8747a4c139a271 /telemetry/vpp-collectd/vpp-hicn/vpp_hicn.c | |
| parent | 3723df3455e88e8534041d1a29b12e8d4a72bb98 (diff) | |
[HICN-657] Remove common.h dependency in collectd plugins
In Ubuntu 20.04, the file common.h is not shipped with collectd
packages anymore. This patch removes that dependency from the collectd
plugins.
Change-Id: I234389ee9cbfd1f1820efdb34d532a7b11618206
Signed-off-by: Olivier Roques <oroques+fdio@cisco.com>
Diffstat (limited to 'telemetry/vpp-collectd/vpp-hicn/vpp_hicn.c')
| -rw-r--r-- | telemetry/vpp-collectd/vpp-hicn/vpp_hicn.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/telemetry/vpp-collectd/vpp-hicn/vpp_hicn.c b/telemetry/vpp-collectd/vpp-hicn/vpp_hicn.c index 591b8f584..4228ac6e6 100644 --- a/telemetry/vpp-collectd/vpp-hicn/vpp_hicn.c +++ b/telemetry/vpp-collectd/vpp-hicn/vpp_hicn.c @@ -13,25 +13,9 @@ * limitations under the License. */ -#if !HAVE_CONFIG_H -#include <stdlib.h> -#include <string.h> - -#ifndef __USE_ISOC99 /* required for NAN */ -#define DISABLE_ISOC99 1 -#define __USE_ISOC99 1 -#endif /* !defined(__USE_ISOC99) */ - -#if DISABLE_ISOC99 -#undef DISABLE_ISOC99 -#undef __USE_ISOC99 -#endif /* DISABLE_ISOC99 */ -#endif /* ! HAVE_CONFIG */ - /* Keep order as it is */ #include <config.h> #include <collectd.h> -#include <common.h> #include <plugin.h> #define counter_t vpp_counter_t @@ -42,6 +26,15 @@ DEFINE_VAPI_MSG_IDS_HICN_API_JSON vapi_ctx_t vapi_ctx; +#define STATIC_ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) + +#define IS_TRUE(s) \ + ((strcasecmp("true", (s)) == 0) || (strcasecmp("yes", (s)) == 0) || \ + (strcasecmp("on", (s)) == 0)) +#define IS_FALSE(s) \ + ((strcasecmp("false", (s)) == 0) || (strcasecmp("no", (s)) == 0) || \ + (strcasecmp("off", (s)) == 0)) + /************** OPTIONS ***********************************/ static const char *config_keys[2] = { "Verbose", @@ -188,6 +181,11 @@ static data_set_t dtx_ds = { /**********************************************************/ /********** UTILITY FUNCTIONS *****************************/ /**********************************************************/ +char *sstrncpy(char *dest, const char *src, size_t n) { + strncpy(dest, src, n); + dest[n - 1] = '\0'; + return dest; +} /* * Utility function used by the read callback to populate a |