summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@nokia.com>2015-09-30 15:57:55 +0300
committerAaro Koskinen <aaro.koskinen@nokia.com>2015-09-30 15:57:55 +0300
commitc4cd1d4d93e4a45a088edb6517555aa7e06e5f86 (patch)
tree4529a045943ee56bf1e96a6d2820318f36e5473d /src/shared
parent5e6ad75f259942c33bbb0b9bfc1e8dd5cc0d96e7 (diff)
fileio: make get_status_field() more generic
All users of get_status_field() expect the field pattern to occur in the beginning of a line, and the delimiter is ':'. Hardcode this into the function, and also skip any whitespace before ':' to support fields in files like /proc/cpuinfo. Add support for returning the full field value (currently stops on first whitespace). Rename the function so it's easier to ensure all callers switch to new semantics.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/sleep-config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 1064fd5cbd..3dedbd1f62 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -226,7 +226,7 @@ static bool enough_memory_for_hibernation(void) {
if (r < 0)
return false;
- r = get_status_field("/proc/meminfo", "\nActive(anon):", &active);
+ r = get_proc_field("/proc/meminfo", "Active(anon)", WHITESPACE, &active);
if (r < 0) {
log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m");
return false;