diff options
| author | Bastien Nocera <hadess@hadess.net> | 2015-04-28 13:01:11 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2015-04-28 13:01:11 +0200 |
| commit | abaf635ce4d9dd66c729360fd19089fc61c67a3b (patch) | |
| tree | 5a9bceabebf3e5d9d7bef96571d706d71d17243b | |
| parent | f8104a112eb967cd4c2aaf57b5a59aafe7c4738f (diff) | |
linux: Use CLAMP() instead of a series of ifs
| -rw-r--r-- | src/linux/up-device-supply.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c index 94bc615..5d15083 100644 --- a/src/linux/up-device-supply.c +++ b/src/linux/up-device-supply.c @@ -678,19 +678,13 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply, /* get a precise percentage */ if (sysfs_file_exists (native_path, "capacity")) { percentage = sysfs_get_double (native_path, "capacity"); - if (percentage < 0.0f) - percentage = 0.0f; - if (percentage > 100.0f) - percentage = 100.0f; + percentage = CLAMP(percentage, 0.0f, 100.0f); /* for devices which provide capacity, but not {energy,charge}_now */ if (energy < 0.1f && energy_full > 0.0f) energy = energy_full * percentage / 100; } else if (energy_full > 0.0f) { percentage = 100.0 * energy / energy_full; - if (percentage < 0.0f) - percentage = 0.0f; - if (percentage > 100.0f) - percentage = 100.0f; + percentage = CLAMP(percentage, 0.0f, 100.0f); } /* the battery isn't charging or discharging, it's just |