marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

battery info: output errors in JSON in every case

Browse Source 
This hopefully fixes http://bugs.i3wm.org/707
This commit is contained in:
Michael Stapelberg 2012-05-15 12:30:23 +02:00
parent 1dfb3128b0
commit 7a77472a81
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/print_battery_info.c
View File

@ -92,8 +92,10 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
} }
} }
if ((full_design == 1) || (remaining == -1)) if ((full_design == -1) || (remaining == -1)) {
OUTPUT_FULL_TEXT("No battery");
return; return;
}
(void)snprintf(statusbuf, sizeof(statusbuf), "%s", (void)snprintf(statusbuf, sizeof(statusbuf), "%s",
(status == CS_CHARGING ? "CHR" : (status == CS_CHARGING ? "CHR" :
@ -134,19 +136,19 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
size_t sysctl_size = sizeof(sysctl_rslt); size_t sysctl_size = sizeof(sysctl_rslt);
if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
printf("No battery"); OUTPUT_FULL_TEXT("No battery");
return; return;
} }
present_rate = sysctl_rslt; present_rate = sysctl_rslt;
if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
printf("No battery"); OUTPUT_FULL_TEXT("No battery");
return; return;
} }
remaining = sysctl_rslt; remaining = sysctl_rslt;
if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL,0) != 0) { if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL,0) != 0) {
printf("No battery"); OUTPUT_FULL_TEXT("No battery");
return; return;
} }