tty-ask-password-agent: modernization

[elogind.git] / src / network / networkd-netdev.c

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 9974913f49b364abbc5e405eed20b0d3a7d68d35..8e53439d32b534b0050975da721310f5f191bee0 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -495,11 +495,6 @@ static int netdev_load_one(Manager *manager, const char *filename) {
         assert(manager);
         assert(filename);
 
-        if (null_or_empty_path(filename)) {
-                log_debug("skipping empty file: %s", filename);
-                return 0;
-        }
-
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
@@ -508,6 +503,11 @@ static int netdev_load_one(Manager *manager, const char *filename) {
                         return -errno;
         }
 
+        if (null_or_empty_fd(fileno(file))) {
+                log_debug("Skipping empty file: %s", filename);
+                return 0;
+        }
+
         netdev = new0(NetDev, 1);
         if (!netdev)
                 return log_oom();
@@ -538,7 +538,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
                 return 0;
 
         if (!NETDEV_VTABLE(netdev)) {
-                log_warning("NetDev with invalid Kind configured in %s. Igonring", filename);
+                log_warning("NetDev with invalid Kind configured in %s. Ignoring", filename);
                 return 0;
         }