From e8e2788dab5ddef7f486bfe3d31bf28bd0480ab2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 4 Mar 2021 17:10:08 +0900 Subject: [PATCH] udev/net: use null_or_empty_path() --- src/udev/net/link-config.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 79281887e0..f06ecd455d 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -110,7 +110,6 @@ int link_config_ctx_new(link_config_ctx **ret) { int link_load_one(link_config_ctx *ctx, const char *filename) { _cleanup_(link_config_freep) link_config *link = NULL; - _cleanup_fclose_ FILE *file = NULL; _cleanup_free_ char *name = NULL; const char *dropin_dirname; size_t i; @@ -119,11 +118,12 @@ int link_load_one(link_config_ctx *ctx, const char *filename) { assert(ctx); assert(filename); - file = fopen(filename, "re"); - if (!file) - return errno == ENOENT ? 0 : -errno; - - if (null_or_empty_fd(fileno(file))) { + r = null_or_empty_path(filename); + if (r == -ENOENT) + return 0; + if (r < 0) + return r; + if (r > 0) { log_debug("Skipping empty file: %s", filename); return 0; } -- 2.25.1