diff --git a/src/sleep/battery-capacity.c b/src/sleep/battery-capacity.c index 2985223a94..f6a1ed25ac 100644 --- a/src/sleep/battery-capacity.c +++ b/src/sleep/battery-capacity.c @@ -108,7 +108,7 @@ static int get_battery_discharge_rate(sd_device *dev, int *ret) { f = fopen(DISCHARGE_RATE_FILEPATH, "re"); if (!f) - return log_debug_errno(errno, "Failed to read discharge rate from " DISCHARGE_RATE_FILEPATH ": %m"); + return log_debug_errno(errno, "Failed to read discharge rate from %s: %m", DISCHARGE_RATE_FILEPATH); current_hash_id = system_battery_identifier_hash(dev); @@ -119,20 +119,22 @@ static int get_battery_discharge_rate(sd_device *dev, int *ret) { r = read_line(f, LONG_LINE_MAX, &line); if (r < 0) - return log_debug_errno(r, "Failed to read discharge rate from " DISCHARGE_RATE_FILEPATH ": %m"); + return log_debug_errno(r, "Failed to read discharge rate from %s: %m", DISCHARGE_RATE_FILEPATH); if (r == 0) break; p = line; r = extract_many_words(&p, NULL, 0, &stored_hash_id, &stored_discharge_rate); if (r < 0) - return log_debug_errno(r, "Failed to parse hash_id and discharge_rate read from " DISCHARGE_RATE_FILEPATH ": %m"); + return log_debug_errno(r, "Failed to parse hash_id and discharge_rate read from %s: %m", + DISCHARGE_RATE_FILEPATH); if (r != 2) - return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid number of items fetched from " DISCHARGE_RATE_FILEPATH); + return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid number of items fetched from %s.", + DISCHARGE_RATE_FILEPATH); r = safe_atou64(stored_hash_id, &hash_id); if (r < 0) - return log_debug_errno(r, "Failed to parse hash ID read from " DISCHARGE_RATE_FILEPATH " location: %m"); + return log_debug_errno(r, "Failed to parse hash ID read from %s: %m", DISCHARGE_RATE_FILEPATH); if (current_hash_id != hash_id) /* matching device not found, move to next line */ @@ -140,10 +142,13 @@ static int get_battery_discharge_rate(sd_device *dev, int *ret) { r = safe_atoi(stored_discharge_rate, &discharge_rate); if (r < 0) - return log_device_debug_errno(dev, r, "Failed to parse discharge rate read from " DISCHARGE_RATE_FILEPATH ": %m"); + return log_device_debug_errno(dev, r, "Failed to parse discharge rate read from %s: %m", + DISCHARGE_RATE_FILEPATH); if (!battery_discharge_rate_is_valid(discharge_rate)) - return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ERANGE), "Invalid battery discharge percentage rate per hour."); + return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ERANGE), + "Invalid battery discharge percentage rate per hour read from %s.", + DISCHARGE_RATE_FILEPATH); *ret = discharge_rate; return 0; /* matching device found, exit iteration */