zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hishamhm-pull-960'

This commit is contained in:
Nathan Scott 2020-08-20 14:19:53 +10:00
parent cdff8aea2a 63fbc3b517
commit a82fd262d7
48 changed files with 155 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.editorconfig
View File

@ -14,3 +14,4 @@ charset = utf-8
[*.{c,h}] [*.{c,h}]
indent_style = space indent_style = space
indent_size = 3 indent_size = 3
trim_trailing_whitespace = true

1
linux/Battery.c
View File

@ -205,7 +205,6 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
continue; continue;
if (type[0] == 'B' && type[1] == 'a' && type[2] == 't') { if (type[0] == 'B' && type[1] == 'a' && type[2] == 't') {
xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/uevent", entryName); xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/uevent", entryName);
int fd = open(filePath, O_RDONLY); int fd = open(filePath, O_RDONLY);
if (fd == -1) { if (fd == -1) {