xbattmon

commit cd2c45c702db347a4c8bcb9edd7452f9a929d9ba
parent 04f2c91430a1e6a20d5cecc8f6df730318dffbe9
Author: sin <sin@2f30.org>
Date:   Sun,  5 Feb 2017 14:14:14 +0000

Remove workaround for old Linux kernel versions

Diffstat:
M
xbattmon.c
 | 
24
+++++-------------------

1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/xbattmon.c b/xbattmon.c
@@ -269,34 +269,20 @@ void
 pollbat(void)
 {
 	FILE *fp;
-	int acon, retry;
+	int acon;
 
-	retry = 3;
-fail1:
 	fp = fopen(PATH_BAT_CAP, "r");
-	if (!fp) {
-		if (retry-- == 0)
-			err(1, "fopen %s", PATH_BAT_CAP);
-		warn("fopen %s", PATH_BAT_CAP);
-		sleep(1);
-		goto fail1;
-	}
+	if (!fp)
+		err(1, "fopen %s", PATH_BAT_CAP);
 	fscanf(fp, "%d", &batcap);
 	fclose(fp);
 
 	if (batcap > maxcap)
 		batcap = maxcap;
 
-	retry = 3;
-fail2:
 	fp = fopen(PATH_AC_ONLINE, "r");
-	if (!fp) {
-		if (retry-- == 0)
-			err(1, "fopen %s", PATH_AC_ONLINE);
-		warn("fopen %s", PATH_AC_ONLINE);
-		sleep(1);
-		goto fail2;
-	}
+	if (!fp)
+		err(1, "fopen %s", PATH_AC_ONLINE);
 	fscanf(fp, "%d", &acon);
 	fclose(fp);