tree-wide: port various places to read_boolean_file()

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index d241f5e7f8998ed05ec03c3cbed4a1dce85c7c78..5b3fc8990d6960d085d22507b518f09d1ab62adf 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -869,16 +869,8 @@ int vt_disallocate(const char *tty_path) {
 }
 
 static int vt_default_utf8(void) {
-        _cleanup_free_ char *b = NULL;
-        int r;
-
         /* Read the default VT UTF8 setting from the kernel */
-
-        r = read_one_line_file("/sys/module/vt/parameters/default_utf8", &b);
-        if (r < 0)
-                return r;
-
-        return parse_boolean(b);
+        return read_boolean_file("/sys/module/vt/parameters/default_utf8");
 }
 
 static int vt_reset_keyboard(int fd) {

diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 0f376f9e5a45cd43a1dca6ec19578a4cf9155163..0cd2215bd21adc28885832c9cb21d2f7acc8385c 100644 (file)
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -12,7 +12,6 @@
 #include "journald-console.h"
 #include "journald-manager.h"
 #include "log.h"
-#include "parse-util.h"
 #include "process-util.h"
 #include "stdio-util.h"
 #include "terminal-util.h"
@@ -22,13 +21,8 @@ static bool prefix_timestamp(void) {
 
         static int cached_printk_time = -1;
 
-        if (_unlikely_(cached_printk_time < 0)) {
-                _cleanup_free_ char *p = NULL;
-
-                cached_printk_time =
-                        read_one_line_file("/sys/module/printk/parameters/time", &p) >= 0
-                        && parse_boolean(p) > 0;
-        }
+        if (_unlikely_(cached_printk_time < 0))
+                cached_printk_time = read_boolean_file("/sys/module/printk/parameters/time") > 0;
 
         return cached_printk_time;
 }

diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index 5f01bfae01651e81e244982de15c667e0ad08174..b784d26c5baf6508bff48b5699e543a86eea0c54 100644 (file)
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -9,9 +9,7 @@
 
 #include "sd-dlopen.h"
 
-#include "alloc-util.h"
 #include "fileio.h"
-#include "parse-util.h"
 
 static void *libapparmor_dl = NULL;
 
@@ -31,18 +29,13 @@ bool mac_apparmor_use(void) {
         if (cached_use >= 0)
                 return cached_use;
 
-        _cleanup_free_ char *p = NULL;
-        r = read_one_line_file("/sys/module/apparmor/parameters/enabled", &p);
+        r = read_boolean_file("/sys/module/apparmor/parameters/enabled");
         if (r < 0) {
                 if (r != -ENOENT)
-                        log_debug_errno(r, "Failed to read /sys/module/apparmor/parameters/enabled, assuming AppArmor is not available: %m");
+                        log_debug_errno(r, "Failed to read and parse /sys/module/apparmor/parameters/enabled, assuming AppArmor is not available: %m");
                 return (cached_use = false);
         }
-
-        r = parse_boolean(p);
-        if (r < 0)
-                log_debug_errno(r, "Failed to parse /sys/module/apparmor/parameters/enabled, assuming AppArmor is not available: %m");
-        if (r <= 0)
+        if (r == 0)
                 return (cached_use = false);
 
         if (dlopen_libapparmor(LOG_DEBUG) < 0)