hal/hald util.c,1.22,1.23

[Richard Hughes]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv18325

Modified Files:
	util.c 
Log Message:
Add checks for negative times and percentages

Index: util.c
===================================================================
RCS file: /cvs/hal/hal/hald/util.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- util.c	11 Aug 2005 07:10:10 -0000	1.22
+++ util.c	19 Aug 2005 19:31:48 -0000	1.23
@@ -56,7 +56,7 @@
  *  @param  id                  Optional ID given to this battery. Unused at present.
  *  @param  chargeLevel         The current charge level of the battery (typically mWh)
  *  @param  chargeLastFull      The last "full" charge of the battery (typically mWh)
- *  @return                     Percentage
+ *  @return                     Percentage, -1 if invalid
  */
 int 
 util_compute_percentage_charge (const char *id,
@@ -79,7 +79,11 @@
 	/* make sure results are sensible */
 	if (percentage > 100) {
 		HAL_WARNING (("Percentage %i, returning 100!", percentage));
-		return 100;
+		return -1;
+	}
+	if (percentage < 0) {
+		HAL_WARNING (("Percentage %i, returning -1!", percentage));
+		return -1;
 	}
 	return percentage;
 }
@@ -94,7 +98,7 @@
  *  @param  chargeLastFull      The last "full" charge of the battery (typically mWh)
  *  @param  isDischarging       If battery is discharging
  *  @param  isCharging          If battery is charging
- *  @return                     Number of seconds, or zero if n/a
+ *  @return                     Number of seconds, or -1 if invalid
  */
 int 
 util_compute_time_remaining (const char *id,
@@ -104,21 +108,32 @@
 			     gboolean isDischarging,
 			     gboolean isCharging)
 {
-
+	int remaining_time = 0;
 	if ((chargeRate <= 0) || (chargeLevel < 0) || (chargeLastFull < 0)) {
 		HAL_WARNING (("chargeRate, chargeLevel or chargeLastFull unknown, returning -1"));
 		return -1;
 	}
+	if (isDischarging && isCharging) {
+		HAL_WARNING (("isDischarging & isCharging TRUE, returning -1"));
+		return -1;
+	}
 	if (isDischarging)
-		return ((double) chargeLevel / (double) chargeRate) * 60 * 60;
-	if (isCharging) {
+		remaining_time = ((double) chargeLevel / (double) chargeRate) * 60 * 60;
+	else if (isCharging) {
 		if(chargeLevel > chargeLastFull ) {
 			HAL_WARNING (("chargeLevel > chargeLastFull, returning -1"));
 			return -1;
 		}
-		return ((double) (chargeLastFull - chargeLevel) / (double) chargeRate) * 60 * 60;
+		remaining_time = ((double) (chargeLastFull - chargeLevel) / (double) chargeRate) * 60 * 60;
 	}
-	return 0;
+	if (remaining_time < 0)
+		remaining_time = -1;
+	/* 60 hours */
+	else if (remaining_time > 60*60*60) {
+		HAL_WARNING (("remaining_time *very* high, returning -1"));
+		remaining_time = -1;
+	}
+	return remaining_time;
 }
 
 gboolean