diff options
| author | Christoph Göttschkes <just.mychris@googlemail.com> | 2013-03-07 21:21:54 +0100 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2013-03-09 11:43:55 +0100 |
| commit | 5e0b8812bfdd3c128bdbfc022d4eb25a4b0d2490 (patch) | |
| tree | 927ad61d106cd3a14f3711eac118747d710aa192 /src/print_battery_info.c | |
| parent | d62e10c56dd02401d89e9d5d2ae32ba51ad9744b (diff) | |
Added format_down option for battery if no battery is available.
Diffstat (limited to 'src/print_battery_info.c')
| -rw-r--r-- | src/print_battery_info.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/print_battery_info.c b/src/print_battery_info.c index 95237d9..c9eee23 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -30,7 +30,7 @@ * worn off your battery is. * */ -void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity) { +void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity) { time_t empty_time; struct tm *empty_tm; char buf[1024]; @@ -61,7 +61,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char static char batpath[512]; sprintf(batpath, path, number); if (!slurp(batpath, buf, sizeof(buf))) { - OUTPUT_FULL_TEXT("No battery"); + OUTPUT_FULL_TEXT(format_down); return; } @@ -123,7 +123,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char } if ((full_design == -1) || (remaining == -1)) { - OUTPUT_FULL_TEXT("No battery"); + OUTPUT_FULL_TEXT(format_down); return; } @@ -196,19 +196,19 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char size_t sysctl_size = sizeof(sysctl_rslt); if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { - OUTPUT_FULL_TEXT("No battery"); + OUTPUT_FULL_TEXT(format_down); return; } present_rate = sysctl_rslt; if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { - OUTPUT_FULL_TEXT("No battery"); + OUTPUT_FULL_TEXT(format_down); return; } remaining = sysctl_rslt; if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL,0) != 0) { - OUTPUT_FULL_TEXT("No battery"); + OUTPUT_FULL_TEXT(format_down); return; } @@ -257,7 +257,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char /* Don't bother to go further if there's no battery present. */ if ((apm_info.battery_state == APM_BATTERY_ABSENT) || (apm_info.battery_state == APM_BATT_UNKNOWN)) { - OUTPUT_FULL_TEXT("No battery"); + OUTPUT_FULL_TEXT(format_down); return; } |