From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 29 Sep 2020 07:00:21 +0000 (+0900)
Subject: network: move log_message_warning_errno() to networkd-util.h
X-Git-Tag: v247-rc1~117^2~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d7d377b800db19728e3b6cb707925e557f5a536;p=thirdparty%2Fsystemd.git

network: move log_message_warning_errno() to networkd-util.h
---

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 9ded5fae0a0..ad1c97b83ea 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -46,13 +46,6 @@
 /* use 128 MB for receive socket kernel queue. */
 #define RCVBUF_SIZE    (128*1024*1024)
 
-static int log_message_warning_errno(sd_netlink_message *m, int err, const char *msg) {
-        const char *err_msg = NULL;
-
-        (void) sd_netlink_message_read_string(m, NLMSGERR_ATTR_MSG, &err_msg);
-        return log_warning_errno(err, "%s: %s%s%m", msg, strempty(err_msg), err_msg ? " " : "");
-}
-
 static int setup_default_address_pool(Manager *m) {
         AddressPool *p;
         int r;
diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h
index 0433f883a32..2b6541d57ed 100644
--- a/src/network/networkd-util.h
+++ b/src/network/networkd-util.h
@@ -2,10 +2,13 @@
 #pragma once
 
 #include "sd-dhcp-lease.h"
+#include "sd-netlink.h"
 
 #include "conf-parser.h"
 #include "hash-funcs.h"
+#include "log.h"
 #include "macro.h"
+#include "string-util.h"
 
 typedef enum AddressFamily {
         /* This is a bitmask, though it usually doesn't feel that way! */
@@ -70,3 +73,10 @@ static inline bool section_is_invalid(NetworkConfigSection *section) {
         }                                                               \
         DEFINE_TRIVIAL_CLEANUP_FUNC(type*, free_func);                  \
         DEFINE_TRIVIAL_CLEANUP_FUNC(type*, free_func##_or_set_invalid);
+
+static inline int log_message_warning_errno(sd_netlink_message *m, int err, const char *msg) {
+        const char *err_msg = NULL;
+
+        (void) sd_netlink_message_read_string(m, NLMSGERR_ATTR_MSG, &err_msg);
+        return log_warning_errno(err, "%s: %s%s%m", msg, strempty(err_msg), err_msg ? " " : "");
+}