X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbattery.c;h=345f606e8f3f834b5398fd15b3c91308607fb4a0;hb=8debae762165367f8a4f85b95f56284c7badf87d;hp=2e27e60e4bcdce4b0be7452a943ce2d398636f60;hpb=e6fc1600ee7bcde75c95db9b1f617caf78fc4c6a;p=collectd.git

diff --git a/src/battery.c b/src/battery.c
index 2e27e60e..345f606e 100644
--- a/src/battery.c
+++ b/src/battery.c
@@ -77,7 +77,7 @@ static int battery_init (void)
 	{
 		len = snprintf (filename, sizeof (filename), battery_pmu_file, battery_pmu_num);
 
-		if ((len >= sizeof (filename)) || (len < 0))
+		if ((len < 0) || ((unsigned int)len >= sizeof (filename)))
 			break;
 
 		if (access (filename, R_OK))
@@ -360,11 +360,11 @@ static int battery_read (void)
 		double *valptr = NULL;
 
 		len = snprintf (filename, sizeof (filename), battery_pmu_file, i);
-		if ((len >= sizeof (filename)) || (len < 0))
+		if ((len < 0) || ((unsigned int)len >= sizeof (filename)))
 			continue;
 
 		len = snprintf (batnum_str, sizeof (batnum_str), "%i", i);
-		if ((len >= sizeof (batnum_str)) || (len < 0))
+		if ((len < 0) || ((unsigned int)len >= sizeof (batnum_str)))
 			continue;
 
 		if ((fh = fopen (filename, "r")) == NULL)
@@ -438,7 +438,7 @@ static int battery_read (void)
 			len = snprintf (filename, sizeof (filename),
 					"/proc/acpi/battery/%s/state",
 					ent->d_name);
-			if ((len >= sizeof (filename)) || (len < 0))
+			if ((len < 0) || ((unsigned int)len >= sizeof (filename)))
 				continue;
 
 			if ((fh = fopen (filename, "r")) == NULL)