X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbattery.c;h=93a7a760d8c00f4e7262a9cab70c7cb4c1245f35;hb=f3610533206238bf4fcb72c76e9a07517d8bc64b;hp=c4c050d7ff1cd11cc70cd2d17323f90da747e542;hpb=49ac868d2346c77335272b8a643bca295db9feaa;p=collectd.git diff --git a/src/battery.c b/src/battery.c index c4c050d7..93a7a760 100644 --- a/src/battery.c +++ b/src/battery.c @@ -24,11 +24,10 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" -#include "utils_complain.h" - #if HAVE_MACH_MACH_TYPES_H # include #endif @@ -143,7 +142,7 @@ static void submit_capacity (char const *plugin_instance, /* {{{ */ } /* }}} void submit_capacity */ #if HAVE_IOKIT_PS_IOPOWERSOURCES_H || HAVE_IOKIT_IOKITLIB_H -static double dict_get_double (CFDictionaryRef dict, char *key_string) /* {{{ */ +static double dict_get_double (CFDictionaryRef dict, const char *key_string) /* {{{ */ { double val_double; long long val_int; @@ -341,7 +340,7 @@ static void get_via_generic_iokit (double *ret_capacity_full, /* {{{ */ *ret_voltage = temp_double / 1000.0; } } - + CFRelease (bat_root_dict); } @@ -358,7 +357,7 @@ static int battery_read (void) /* {{{ */ * IOPowerSources. IOKit, on the other hand, only reports the full * capacity. We use the two to calculate the current charged capacity. */ gauge_t charge_rel = NAN; /* Current charge in percent */ - gauge_t capacity_charged = NAN; /* Charged capacity */ + gauge_t capacity_charged; /* Charged capacity */ gauge_t capacity_full = NAN; /* Total capacity */ gauge_t capacity_design = NAN; /* Full design capacity */