X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fmic.c;h=4f4a9bacea13cfc2bf2fa86b802f548d386d8162;hp=a7ee433c2279f7e0e4f143bf66287b14f5bafe8f;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=6d79874b8afa65cbb4a8e348caf37b8e60fbeded diff --git a/src/mic.c b/src/mic.c index a7ee433c..4f4a9bac 100644 --- a/src/mic.c +++ b/src/mic.c @@ -35,8 +35,8 @@ #define MAX_CORES 256 static MicDeviceOnSystem mics[MAX_MICS]; -static U32 num_mics = 0; -static HANDLE mic_handle = NULL; +static U32 num_mics; +static HANDLE mic_handle; static int const therm_ids[] = { eMicThermalDie, eMicThermalDevMem, eMicThermalFin, eMicThermalFout, @@ -50,13 +50,13 @@ static const char *config_keys[] = { "ShowPower", "Power", "IgnoreSelectedPower"}; static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); -static _Bool show_cpu = 1; -static _Bool show_cpu_cores = 1; -static _Bool show_memory = 1; -static _Bool show_temps = 1; -static ignorelist_t *temp_ignore = NULL; -static _Bool show_power = 1; -static ignorelist_t *power_ignore = NULL; +static bool show_cpu = true; +static bool show_cpu_cores = true; +static bool show_memory = true; +static bool show_temps = true; +static ignorelist_t *temp_ignore; +static bool show_power = true; +static ignorelist_t *power_ignore; static int mic_init(void) { U32 ret; @@ -163,7 +163,6 @@ static void mic_submit_temp(int micnumber, const char *type, gauge_t value) { vl.values = &(value_t){.gauge = value}; vl.values_len = 1; - strncpy(vl.host, hostname_g, sizeof(vl.host)); strncpy(vl.plugin, "mic", sizeof(vl.plugin)); snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%i", micnumber); strncpy(vl.type, "temperature", sizeof(vl.type)); @@ -205,7 +204,6 @@ static void mic_submit_cpu(int micnumber, const char *type_instance, int core, vl.values = &(value_t){.derive = value}; vl.values_len = 1; - strncpy(vl.host, hostname_g, sizeof(vl.host)); strncpy(vl.plugin, "mic", sizeof(vl.plugin)); if (core < 0) /* global aggregation */ snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%i", micnumber); @@ -259,7 +257,6 @@ static void mic_submit_power(int micnumber, const char *type, vl.values = &(value_t){.gauge = value}; vl.values_len = 1; - strncpy(vl.host, hostname_g, sizeof(vl.host)); strncpy(vl.plugin, "mic", sizeof(vl.plugin)); snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%i", micnumber); strncpy(vl.type, type, sizeof(vl.type));