log: add an "error" parameter to all low-level logging calls and intrdouce log_error_...

This change has two benefits:

- The format string %m will now resolve to the specified error (or to
  errno if the specified error is 0. This allows getting rid of a ton of
  strerror() invocations, a function that is not thread-safe.

- The specified error can be passed to the journal in the ERRNO= field.

Now of course, we just need somebody to convert all cases of this:

        log_error("Something happened: %s", strerror(-r));

into thus:

        log_error_errno(-r, "Something happened: %m");

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 4795a47eb4b87b172b66878464cad2024ede847a..50af7932f636b559f9d8e6649a6920455067473e 100644 (file)
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -44,7 +44,7 @@ static void systemd_kmod_log(
 
         /* library logging is enabled at debug only */
         DISABLE_WARNING_FORMAT_NONLITERAL;
 
         /* library logging is enabled at debug only */
         DISABLE_WARNING_FORMAT_NONLITERAL;

-        log_metav(LOG_DEBUG, file, line, fn, format, args);
+        log_metav(LOG_DEBUG, 0, file, line, fn, format, args);

         REENABLE_WARNING;
 }
 
         REENABLE_WARNING;
 }
 

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index a50dec3961cab361e0eec2c1fc0857c017cbbc57..b3835d59a5b027834ef396d581b9cfba4e41bb0b 100644 (file)
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -112,7 +112,7 @@ _printf_(2, 3) static int log_callback(int type, const char *fmt, ...) {
 #endif
 
         va_start(ap, fmt);
 #endif
 
         va_start(ap, fmt);

-        log_metav(LOG_USER | LOG_INFO, __FILE__, __LINE__, __FUNCTION__, fmt, ap);
+        log_metav(LOG_USER | LOG_INFO, 0, __FILE__, __LINE__, __FUNCTION__, fmt, ap);

         va_end(ap);
 
         return 0;
         va_end(ap);
 
         return 0;

diff --git a/src/core/unit.h b/src/core/unit.h
index 8b242722454a14bf63bc5c00f56358af100c6a85..54ba11a889f5625a0f2bbe0d8e1b3a654ba779ee 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -596,7 +596,9 @@ UnitActiveState unit_active_state_from_string(const char *s) _pure_;
 
 /* Macros which append UNIT= or USER_UNIT= to the message */
 
 
 /* Macros which append UNIT= or USER_UNIT= to the message */
 

-#define log_full_unit(level, unit, ...) log_meta_object(level, __FILE__, __LINE__, __func__, getpid() == 1 ? "UNIT=" : "USER_UNIT=", unit, __VA_ARGS__)
+#define log_full_unit(level, unit, ...) log_meta_object(level, 0, __FILE__, __LINE__, __func__, getpid() == 1 ? "UNIT=" : "USER_UNIT=", unit, __VA_ARGS__)
+#define log_full_unit_errno(level, error, unit, ...) log_meta_object(level, error, __FILE__, __LINE__, __func__, getpid() == 1 ? "UNIT=" : "USER_UNIT=", unit, __VA_ARGS__)
+

 #define log_debug_unit(unit, ...)       log_full_unit(LOG_DEBUG, unit, __VA_ARGS__)
 #define log_info_unit(unit, ...)        log_full_unit(LOG_INFO, unit, __VA_ARGS__)
 #define log_notice_unit(unit, ...)      log_full_unit(LOG_NOTICE, unit, __VA_ARGS__)
 #define log_debug_unit(unit, ...)       log_full_unit(LOG_DEBUG, unit, __VA_ARGS__)
 #define log_info_unit(unit, ...)        log_full_unit(LOG_INFO, unit, __VA_ARGS__)
 #define log_notice_unit(unit, ...)      log_full_unit(LOG_NOTICE, unit, __VA_ARGS__)

diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 55c45f46939ce3eaea739e76515b9737fe7f15e5..bec41346209e7c472e2633093505b1fb75a51dd4 100644 (file)
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -41,7 +41,7 @@ void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         f = strappenda("microhttpd: ", fmt);
 
         DISABLE_WARNING_FORMAT_NONLITERAL;
         f = strappenda("microhttpd: ", fmt);
 
         DISABLE_WARNING_FORMAT_NONLITERAL;

-        log_metav(LOG_INFO, NULL, 0, NULL, f, ap);
+        log_metav(LOG_INFO, 0, NULL, 0, NULL, f, ap);

         REENABLE_WARNING;
 }
 
         REENABLE_WARNING;
 }
 


@@ -126,11 +126,10 @@ void log_func_gnutls(int level, const char *message) {
 
         if (0 <= level && level < (int) ELEMENTSOF(gnutls_log_map)) {
                 if (gnutls_log_map[level].enabled)
 
         if (0 <= level && level < (int) ELEMENTSOF(gnutls_log_map)) {
                 if (gnutls_log_map[level].enabled)

-                        log_meta(gnutls_log_map[level].level, NULL, 0, NULL,
-                                 "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message);
+                        log_meta(gnutls_log_map[level].level, 0, NULL, 0, NULL, "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message);

         } else {
                 log_debug("Received GNUTLS message with unknown level %d.", level);
         } else {
                 log_debug("Received GNUTLS message with unknown level %d.", level);

-                log_meta(LOG_DEBUG, NULL, 0, NULL, "gnutls: %s", message);
+                log_meta(LOG_DEBUG, 0, NULL, 0, NULL, "gnutls: %s", message);

         }
 }
 
         }
 }
 

diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h
index d358a49307e997400817c7ec4ed2addf19c35b06..d76d0c29d0742cce753c09042d98ed10423e3d46 100644 (file)
--- a/src/libsystemd-network/dhcp-internal.h
+++ b/src/libsystemd-network/dhcp-internal.h
@@ -71,4 +71,4 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_client*, sd_dhcp_client_unref);
 #define DHCP_CLIENT_DONT_DESTROY(client) \
         _cleanup_dhcp_client_unref_ _unused_ sd_dhcp_client *_dont_destroy_##client = sd_dhcp_client_ref(client)
 
 #define DHCP_CLIENT_DONT_DESTROY(client) \
         _cleanup_dhcp_client_unref_ _unused_ sd_dhcp_client *_dont_destroy_##client = sd_dhcp_client_ref(client)
 

-#define log_dhcp_client(client, fmt, ...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, "DHCP CLIENT (0x%x): " fmt, client->xid, ##__VA_ARGS__)
+#define log_dhcp_client(client, fmt, ...) log_meta(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "DHCP CLIENT (0x%x): " fmt, client->xid, ##__VA_ARGS__)

diff --git a/src/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h
index 480da22c016764e56639fc596f7ce2358da7099f..6c2c2486964f8c2926996d8e1cc98599fa7a4a01 100644 (file)
--- a/src/libsystemd-network/dhcp-server-internal.h
+++ b/src/libsystemd-network/dhcp-server-internal.h
@@ -79,7 +79,7 @@ typedef struct DHCPRequest {
 DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_server*, sd_dhcp_server_unref);
 #define _cleanup_dhcp_server_unref_ _cleanup_(sd_dhcp_server_unrefp)
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_server*, sd_dhcp_server_unref);
 #define _cleanup_dhcp_server_unref_ _cleanup_(sd_dhcp_server_unrefp)
 

-#define log_dhcp_server(client, fmt, ...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, "DHCP SERVER: " fmt, ##__VA_ARGS__)
+#define log_dhcp_server(client, fmt, ...) log_meta(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "DHCP SERVER: " fmt, ##__VA_ARGS__)

 
 int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
                                size_t length);
 
 int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
                                size_t length);

diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h
index 6cc0aa8a8d0c24c945d276a165a3e3d6b2c821d6..3737d49a3af8ca079f31e6456448a6c2fa1042a5 100644 (file)
--- a/src/libsystemd-network/dhcp6-internal.h
+++ b/src/libsystemd-network/dhcp6-internal.h
@@ -56,7 +56,7 @@ struct DHCP6IA {
 
 typedef struct DHCP6IA DHCP6IA;
 
 
 typedef struct DHCP6IA DHCP6IA;
 

-#define log_dhcp6_client(p, fmt, ...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, "DHCPv6 CLIENT: " fmt, ##__VA_ARGS__)
+#define log_dhcp6_client(p, fmt, ...) log_meta(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "DHCPv6 CLIENT: " fmt, ##__VA_ARGS__)

 
 int dhcp_network_icmp6_bind_router_solicitation(int index);
 int dhcp_network_icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr);
 
 int dhcp_network_icmp6_bind_router_solicitation(int index);
 int dhcp_network_icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr);

diff --git a/src/libsystemd-network/ipv4ll-internal.h b/src/libsystemd-network/ipv4ll-internal.h
index fe5ef8e2b89781ed2b524a03d4383f486651f6c2..7b5d3729e5d6d887f02b63d00f99b996498e23a8 100644 (file)
--- a/src/libsystemd-network/ipv4ll-internal.h
+++ b/src/libsystemd-network/ipv4ll-internal.h
@@ -35,4 +35,4 @@ void arp_packet_probe(struct ether_arp *arp, be32_t pa, const struct ether_addr
 void arp_packet_announcement(struct ether_arp *arp, be32_t pa, const struct ether_addr *ha);
 int arp_packet_verify_headers(struct ether_arp *arp);
 
 void arp_packet_announcement(struct ether_arp *arp, be32_t pa, const struct ether_addr *ha);
 int arp_packet_verify_headers(struct ether_arp *arp);
 

-#define log_ipv4ll(ll, fmt, ...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, "IPv4LL: " fmt, ##__VA_ARGS__)
+#define log_ipv4ll(ll, fmt, ...) log_meta(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "IPv4LL: " fmt, ##__VA_ARGS__)

diff --git a/src/libsystemd-network/sd-icmp6-nd.c b/src/libsystemd-network/sd-icmp6-nd.c
index 2473fbbddf25d3aefdd94e4c8a29df3487f3ff95..23f5682c51a22ecbcc841edfd3a0df8501802da9 100644 (file)
--- a/src/libsystemd-network/sd-icmp6-nd.c
+++ b/src/libsystemd-network/sd-icmp6-nd.c
@@ -54,7 +54,7 @@ struct sd_icmp6_nd {
         void *userdata;
 };
 
         void *userdata;
 };
 

-#define log_icmp6_nd(p, fmt, ...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, "ICMPv6 CLIENT: " fmt, ##__VA_ARGS__)
+#define log_icmp6_nd(p, fmt, ...) log_meta(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "ICMPv6 CLIENT: " fmt, ##__VA_ARGS__)

 
 static void icmp6_nd_notify(sd_icmp6_nd *nd, int event)
 {
 
 static void icmp6_nd_notify(sd_icmp6_nd *nd, int event)
 {

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index c676fd1c1890cd89903dfebb2b470f7c290659f7..da67247be4dfb11eadf0c985bd8d3dbf64fa85f7 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -44,7 +44,7 @@ static void systemd_kmod_log(void *data, int priority, const char *file, int lin
                              const char *fn, const char *format, va_list args) {
 
         DISABLE_WARNING_FORMAT_NONLITERAL;
                              const char *fn, const char *format, va_list args) {
 
         DISABLE_WARNING_FORMAT_NONLITERAL;

-        log_metav(priority, file, line, fn, format, args);
+        log_metav(priority, 0, file, line, fn, format, args);

         REENABLE_WARNING;
 }
 
         REENABLE_WARNING;
 }
 

diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 5467bc372e3455e07cf108bd6b40326b86e1efd4..fd55f79693e66d248694cb1b3146201352dbf6ab 100644 (file)
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -40,8 +40,7 @@ static int ipv4ll_address_lost(Link *link) {
         if (r < 0)
                 return 0;
 
         if (r < 0)
                 return 0;
 

-        log_debug_link(link, "IPv4 link-local release %u.%u.%u.%u",
-                       ADDRESS_FMT_VAL(addr));
+        log_debug_link(link, "IPv4 link-local release %u.%u.%u.%u", ADDRESS_FMT_VAL(addr));

 
         r = address_new_dynamic(&address);
         if (r < 0) {
 
         r = address_new_dynamic(&address);
         if (r < 0) {

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 7acf404f874513319cd8339ff002753ce555d2ad..5eb4b889317473c324d8f3ff159da70c178c756b 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -132,7 +132,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref);
 
 /* Macros which append INTERFACE= to the message */
 
 
 /* Macros which append INTERFACE= to the message */
 

-#define log_full_link(level, link, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)
+#define log_full_link(level, link, fmt, ...) log_meta_object(level, 0, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)

 #define log_debug_link(link, ...)       log_full_link(LOG_DEBUG, link, ##__VA_ARGS__)
 #define log_info_link(link, ...)        log_full_link(LOG_INFO, link, ##__VA_ARGS__)
 #define log_notice_link(link, ...)      log_full_link(LOG_NOTICE, link, ##__VA_ARGS__)
 #define log_debug_link(link, ...)       log_full_link(LOG_DEBUG, link, ##__VA_ARGS__)
 #define log_info_link(link, ...)        log_full_link(LOG_INFO, link, ##__VA_ARGS__)
 #define log_notice_link(link, ...)      log_full_link(LOG_NOTICE, link, ##__VA_ARGS__)

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index fd1f51ec56d5399bf49b87a4ec82f540521688ad..bdb0b888a0e57ff0e2abbda8914cb9dde1ffda1b 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -65,7 +65,6 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
 DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind);
 DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetDevKind, "Failed to parse netdev kind");
 
 DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind);
 DEFINE_CONFIG_PARSE_ENUM(config_parse_netdev_kind, netdev_kind, NetDevKind, "Failed to parse netdev kind");
 

-

 static void netdev_cancel_callbacks(NetDev *netdev) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
         netdev_join_callback *callback;
 static void netdev_cancel_callbacks(NetDev *netdev) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
         netdev_join_callback *callback;

diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
index a6fad2dbc465946ddce061ecd7b61a5741964eb7..54339aec73bea7d7b88ce695e375eed7daed843a 100644 (file)
--- a/src/network/networkd-netdev.h
+++ b/src/network/networkd-netdev.h
@@ -192,7 +192,7 @@ const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsign
 
 /* Macros which append INTERFACE= to the message */
 
 
 /* Macros which append INTERFACE= to the message */
 

-#define log_full_netdev(level, netdev, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", netdev->ifname, "%-*s: " fmt, IFNAMSIZ, netdev->ifname, ##__VA_ARGS__)
+#define log_full_netdev(level, netdev, fmt, ...) log_meta_object(level, 0, __FILE__, __LINE__, __func__, "INTERFACE=", netdev->ifname, "%-*s: " fmt, IFNAMSIZ, netdev->ifname, ##__VA_ARGS__)

 #define log_debug_netdev(netdev, ...)       log_full_netdev(LOG_DEBUG, netdev, ##__VA_ARGS__)
 #define log_info_netdev(netdev, ...)        log_full_netdev(LOG_INFO, netdev, ##__VA_ARGS__)
 #define log_notice_netdev(netdev, ...)      log_full_netdev(LOG_NOTICE, netdev, ##__VA_ARGS__)
 #define log_debug_netdev(netdev, ...)       log_full_netdev(LOG_DEBUG, netdev, ##__VA_ARGS__)
 #define log_info_netdev(netdev, ...)        log_full_netdev(LOG_INFO, netdev, ##__VA_ARGS__)
 #define log_notice_netdev(netdev, ...)      log_full_netdev(LOG_NOTICE, netdev, ##__VA_ARGS__)

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 19a661e1312cebcbf03ab830cd0b704989908542..9acf31cd1d556917072e6682e2b46880934acaae 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -336,7 +336,7 @@ int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union
 
 /* Macros which append INTERFACE= to the message */
 
 
 /* Macros which append INTERFACE= to the message */
 

-#define log_full_link(level, link, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)
+#define log_full_link(level, link, fmt, ...) log_meta_object(level, 0, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)

 #define log_debug_link(link, ...)       log_full_link(LOG_DEBUG, link, ##__VA_ARGS__)
 #define log_info_link(link, ...)        log_full_link(LOG_INFO, link, ##__VA_ARGS__)
 #define log_notice_link(link, ...)      log_full_link(LOG_NOTICE, link, ##__VA_ARGS__)
 #define log_debug_link(link, ...)       log_full_link(LOG_DEBUG, link, ##__VA_ARGS__)
 #define log_info_link(link, ...)        log_full_link(LOG_INFO, link, ##__VA_ARGS__)
 #define log_notice_link(link, ...)      log_full_link(LOG_NOTICE, link, ##__VA_ARGS__)

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 027c49ce3bdee71f3f3fb77d4cd2d789ed654b15..6bd9d9ebf74476572b6cb378ac57f1c2915b9e4a 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -38,10 +38,16 @@
 #include "exit-status.h"
 #include "sd-messages.h"
 
 #include "exit-status.h"
 #include "sd-messages.h"
 

-int log_syntax_internal(const char *unit, int level,
-                        const char *file, unsigned line, const char *func,
-                        const char *config_file, unsigned config_line,
-                        int error, const char *format, ...) {
+int log_syntax_internal(
+                const char *unit,
+                int level,
+                const char *file,
+                int line,
+                const char *func,
+                const char *config_file,
+                unsigned config_line,
+                int error,
+                const char *format, ...) {

 
         _cleanup_free_ char *msg = NULL;
         int r;
 
         _cleanup_free_ char *msg = NULL;
         int r;


@@ -55,21 +61,21 @@ int log_syntax_internal(const char *unit, int level,
 
         if (unit)
                 r = log_struct_internal(level,
 
         if (unit)
                 r = log_struct_internal(level,

+                                        error > 0 ? error : EINVAL,

                                         file, line, func,
                                         getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit,
                                         MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
                                         "CONFIG_FILE=%s", config_file,
                                         "CONFIG_LINE=%u", config_line,
                                         file, line, func,
                                         getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit,
                                         MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
                                         "CONFIG_FILE=%s", config_file,
                                         "CONFIG_LINE=%u", config_line,

-                                        "ERRNO=%d", error > 0 ? error : EINVAL,

                                         "MESSAGE=[%s:%u] %s", config_file, config_line, msg,
                                         NULL);
         else
                 r = log_struct_internal(level,
                                         "MESSAGE=[%s:%u] %s", config_file, config_line, msg,
                                         NULL);
         else
                 r = log_struct_internal(level,

+                                        error > 0 ? error : EINVAL,

                                         file, line, func,
                                         MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
                                         "CONFIG_FILE=%s", config_file,
                                         "CONFIG_LINE=%u", config_line,
                                         file, line, func,
                                         MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
                                         "CONFIG_FILE=%s", config_file,
                                         "CONFIG_LINE=%u", config_line,

-                                        "ERRNO=%d", error > 0 ? error : EINVAL,

                                         "MESSAGE=[%s:%u] %s", config_file, config_line, msg,
                                         NULL);
 
                                         "MESSAGE=[%s:%u] %s", config_file, config_line, msg,
                                         NULL);
 

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index 69d32711b7fbfcd94a1df1462571388b44458901..2507a44444a5e620f32554a90a2c2c4ffe4aa75f 100644 (file)
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -119,10 +119,16 @@ int config_parse_mode(const char *unit, const char *filename, unsigned line, con
 int config_parse_log_facility(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_log_level(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 
 int config_parse_log_facility(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_log_level(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 

-int log_syntax_internal(const char *unit, int level,
-                        const char *file, unsigned line, const char *func,
-                        const char *config_file, unsigned config_line,
-                        int error, const char *format, ...) _printf_(9, 10);
+int log_syntax_internal(
+                const char *unit,
+                int level,
+                const char *file,
+                int line,
+                const char *func,
+                const char *config_file,
+                unsigned config_line,
+                int error,
+                const char *format, ...) _printf_(9, 10);

 
 #define log_syntax(unit, level, config_file, config_line, error, ...)   \
         log_syntax_internal(unit, level,                                \
 
 #define log_syntax(unit, level, config_file, config_line, error, ...)   \
         log_syntax_internal(unit, level,                                \

diff --git a/src/shared/log.c b/src/shared/log.c
index d465311d02d0df661c13a33e5cfcc593a1f99648..ba959b914e117ef0d3639dc3bdff35604d74fa9b 100644 (file)
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -122,7 +122,7 @@ static int create_log_socket(int type) {
                 timeval_store(&tv, 10 * USEC_PER_MSEC);
         else
                 timeval_store(&tv, 10 * USEC_PER_SEC);
                 timeval_store(&tv, 10 * USEC_PER_MSEC);
         else
                 timeval_store(&tv, 10 * USEC_PER_SEC);

-        (void)setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+        (void) setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));

 
         return fd;
 }
 
         return fd;
 }


@@ -302,10 +302,11 @@ void log_set_facility(int facility) {
 
 static int write_to_console(
                 int level,
 
 static int write_to_console(
                 int level,

+                int error,

                 const char*file,
                 int line,
                 const char *func,
                 const char*file,
                 int line,
                 const char *func,

-                const char *object_name,
+                const char *object_field,

                 const char *object,
                 const char *buffer) {
 
                 const char *object,
                 const char *buffer) {
 


@@ -356,13 +357,14 @@ static int write_to_console(
 }
 
 static int write_to_syslog(
 }
 
 static int write_to_syslog(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *object_name,
-        const char *object,
-        const char *buffer) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *object_field,
+                const char *object,
+                const char *buffer) {

 
         char header_priority[16], header_time[64], header_pid[16];
         struct iovec iovec[5] = {};
 
         char header_priority[16], header_time[64], header_pid[16];
         struct iovec iovec[5] = {};


@@ -418,13 +420,14 @@ static int write_to_syslog(
 }
 
 static int write_to_kmsg(
 }
 
 static int write_to_kmsg(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *object_name,
-        const char *object,
-        const char *buffer) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *object_field,
+                const char *object,
+                const char *buffer) {

 
         char header_priority[16], header_pid[16];
         struct iovec iovec[5] = {};
 
         char header_priority[16], header_pid[16];
         struct iovec iovec[5] = {};


@@ -450,45 +453,55 @@ static int write_to_kmsg(
         return 1;
 }
 
         return 1;
 }
 

-static int log_do_header(char *header, size_t size,
-                         int level,
-                         const char *file, int line, const char *func,
-                         const char *object_name, const char *object) {
+static int log_do_header(
+                char *header,
+                size_t size,
+                int level,
+                int error,
+                const char *file, int line, const char *func,
+                const char *object_field, const char *object) {
+

         snprintf(header, size,
                  "PRIORITY=%i\n"
                  "SYSLOG_FACILITY=%i\n"
         snprintf(header, size,
                  "PRIORITY=%i\n"
                  "SYSLOG_FACILITY=%i\n"

-                 "%s%.*s%s"
+                 "%s%s%s"

                  "%s%.*i%s"
                  "%s%.*i%s"

-                 "%s%.*s%s"
-                 "%s%.*s%s"
+                 "%s%s%s"
+                 "%s%.*i%s"
+                 "%s%s%s"

                  "SYSLOG_IDENTIFIER=%s\n",
                  LOG_PRI(level),
                  LOG_FAC(level),
                  "SYSLOG_IDENTIFIER=%s\n",
                  LOG_PRI(level),
                  LOG_FAC(level),

-                 file ? "CODE_FILE=" : "",
-                 file ? LINE_MAX : 0, file, /* %.0s means no output */
-                 file ? "\n" : "",
+                 isempty(file) ? "" : "CODE_FILE=",
+                 isempty(file) ? "" : file,
+                 isempty(file) ? "" : "\n",

                  line ? "CODE_LINE=" : "",
                  line ? 1 : 0, line, /* %.0d means no output too, special case for 0 */
                  line ? "\n" : "",
                  line ? "CODE_LINE=" : "",
                  line ? 1 : 0, line, /* %.0d means no output too, special case for 0 */
                  line ? "\n" : "",

-                 func ? "CODE_FUNCTION=" : "",
-                 func ? LINE_MAX : 0, func,
-                 func ? "\n" : "",
-                 object ? object_name : "",
-                 object ? LINE_MAX : 0, object, /* %.0s means no output */
-                 object ? "\n" : "",
+                 isempty(func) ? "" : "CODE_FUNCTION=",
+                 isempty(func) ? "" : func,
+                 isempty(func) ? "" : "\n",
+                 error ? "ERRNO=" : "",
+                 error ? 1 : 0, error,
+                 error ? "\n" : "",
+                 isempty(object) ? "" : object_field,
+                 isempty(object) ? "" : object,
+                 isempty(object) ? "" : "\n",

                  program_invocation_short_name);
         header[size - 1] = '\0';
                  program_invocation_short_name);
         header[size - 1] = '\0';

+

         return 0;
 }
 
 static int write_to_journal(
         return 0;
 }
 
 static int write_to_journal(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *object_name,
-        const char *object,
-        const char *buffer) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *object_field,
+                const char *object,
+                const char *buffer) {

 
         char header[LINE_MAX];
         struct iovec iovec[4] = {};
 
         char header[LINE_MAX];
         struct iovec iovec[4] = {};


@@ -497,8 +510,7 @@ static int write_to_journal(
         if (journal_fd < 0)
                 return 0;
 
         if (journal_fd < 0)
                 return 0;
 

-        log_do_header(header, sizeof(header), level,
-                      file, line, func, object_name, object);
+        log_do_header(header, sizeof(header), level, error, file, line, func, object_field, object);

 
         IOVEC_SET_STRING(iovec[0], header);
         IOVEC_SET_STRING(iovec[1], "MESSAGE=");
 
         IOVEC_SET_STRING(iovec[0], header);
         IOVEC_SET_STRING(iovec[1], "MESSAGE=");


@@ -515,13 +527,14 @@ static int write_to_journal(
 }
 
 static int log_dispatch(
 }
 
 static int log_dispatch(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *object_name,
-        const char *object,
-        char *buffer) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *object_field,
+                const char *object,
+                char *buffer) {

 
         int r = 0;
 
 
         int r = 0;
 


@@ -548,8 +561,7 @@ static int log_dispatch(
                     log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
                     log_target == LOG_TARGET_JOURNAL) {
 
                     log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
                     log_target == LOG_TARGET_JOURNAL) {
 

-                        k = write_to_journal(level, file, line, func,
-                                             object_name, object, buffer);
+                        k = write_to_journal(level, error, file, line, func, object_field, object, buffer);

                         if (k < 0) {
                                 if (k != -EAGAIN)
                                         log_close_journal();
                         if (k < 0) {
                                 if (k != -EAGAIN)
                                         log_close_journal();


@@ -561,8 +573,7 @@ static int log_dispatch(
                 if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
                     log_target == LOG_TARGET_SYSLOG) {
 
                 if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
                     log_target == LOG_TARGET_SYSLOG) {
 

-                        k = write_to_syslog(level, file, line, func,
-                                            object_name, object, buffer);
+                        k = write_to_syslog(level, error, file, line, func, object_field, object, buffer);

                         if (k < 0) {
                                 if (k != -EAGAIN)
                                         log_close_syslog();
                         if (k < 0) {
                                 if (k != -EAGAIN)
                                         log_close_syslog();


@@ -578,8 +589,7 @@ static int log_dispatch(
                      log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
                      log_target == LOG_TARGET_KMSG)) {
 
                      log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
                      log_target == LOG_TARGET_KMSG)) {
 

-                        k = write_to_kmsg(level, file, line, func,
-                                          object_name, object, buffer);
+                        k = write_to_kmsg(level, error, file, line, func, object_field, object, buffer);

                         if (k < 0) {
                                 log_close_kmsg();
                                 log_open_console();
                         if (k < 0) {
                                 log_close_kmsg();
                                 log_open_console();


@@ -588,8 +598,7 @@ static int log_dispatch(
                 }
 
                 if (k <= 0) {
                 }
 
                 if (k <= 0) {

-                        k = write_to_console(level, file, line, func,
-                                             object_name, object, buffer);
+                        k = write_to_console(level, error, file, line, func, object_field, object, buffer);

                         if (k < 0)
                                 return k;
                 }
                         if (k < 0)
                                 return k;
                 }


@@ -602,6 +611,7 @@ static int log_dispatch(
 
 int log_dump_internal(
         int level,
 
 int log_dump_internal(
         int level,

+        int error,

         const char*file,
         int line,
         const char *func,
         const char*file,
         int line,
         const char *func,


@@ -614,16 +624,17 @@ int log_dump_internal(
         if (_likely_(LOG_PRI(level) > log_max_level))
                 return 0;
 
         if (_likely_(LOG_PRI(level) > log_max_level))
                 return 0;
 

-        return log_dispatch(level, file, line, func, NULL, NULL, buffer);
+        return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);

 }
 
 int log_metav(
 }
 
 int log_metav(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *format,
-        va_list ap) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *format,
+                va_list ap) {

 
         PROTECT_ERRNO;
         char buffer[LINE_MAX];
 
         PROTECT_ERRNO;
         char buffer[LINE_MAX];


@@ -631,38 +642,44 @@ int log_metav(
         if (_likely_(LOG_PRI(level) > log_max_level))
                 return 0;
 
         if (_likely_(LOG_PRI(level) > log_max_level))
                 return 0;
 

+        /* Make sure that %m maps to the specified error */
+        if (error != 0)
+                errno = error;
+

         vsnprintf(buffer, sizeof(buffer), format, ap);
         char_array_0(buffer);
 
         vsnprintf(buffer, sizeof(buffer), format, ap);
         char_array_0(buffer);
 

-        return log_dispatch(level, file, line, func, NULL, NULL, buffer);
+        return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);

 }
 
 int log_meta(
 }
 
 int log_meta(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *format, ...) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *format, ...) {

 
         int r;
         va_list ap;
 
         va_start(ap, format);
 
         int r;
         va_list ap;
 
         va_start(ap, format);

-        r = log_metav(level, file, line, func, format, ap);
+        r = log_metav(level, error, file, line, func, format, ap);

         va_end(ap);
 
         return r;
 }
 
 int log_metav_object(
         va_end(ap);
 
         return r;
 }
 
 int log_metav_object(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *object_name,
-        const char *object,
-        const char *format,
-        va_list ap) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *object_field,
+                const char *object,
+                const char *format,
+                va_list ap) {

 
         PROTECT_ERRNO;
         char buffer[LINE_MAX];
 
         PROTECT_ERRNO;
         char buffer[LINE_MAX];


@@ -670,34 +687,44 @@ int log_metav_object(
         if (_likely_(LOG_PRI(level) > log_max_level))
                 return 0;
 
         if (_likely_(LOG_PRI(level) > log_max_level))
                 return 0;
 

+        /* Make sure that %m maps to the specified error */
+        if (error != 0)
+                errno = error;
+

         vsnprintf(buffer, sizeof(buffer), format, ap);
         char_array_0(buffer);
 
         vsnprintf(buffer, sizeof(buffer), format, ap);
         char_array_0(buffer);
 

-        return log_dispatch(level, file, line, func,
-                            object_name, object, buffer);
+        return log_dispatch(level, error, file, line, func, object_field, object, buffer);

 }
 
 int log_meta_object(
 }
 
 int log_meta_object(

-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *object_name,
-        const char *object,
-        const char *format, ...) {
+                int level,
+                int error,
+                const char*file,
+                int line,
+                const char *func,
+                const char *object_field,
+                const char *object,
+                const char *format, ...) {

 
         int r;
         va_list ap;
 
         va_start(ap, format);
 
         int r;
         va_list ap;
 
         va_start(ap, format);

-        r = log_metav_object(level, file, line, func,
-                             object_name, object, format, ap);
+        r = log_metav_object(level, error, file, line, func, object_field, object, format, ap);

         va_end(ap);
 
         return r;
 }
 
         va_end(ap);
 
         return r;
 }
 

-static void log_assert(int level, const char *text, const char *file, int line, const char *func, const char *format) {
+static void log_assert(
+                int level,
+                const char *text,
+                const char *file,
+                int line,
+                const char *func,
+                const char *format) {
+

         static char buffer[LINE_MAX];
 
         if (_likely_(LOG_PRI(level) > log_max_level))
         static char buffer[LINE_MAX];
 
         if (_likely_(LOG_PRI(level) > log_max_level))


@@ -710,7 +737,7 @@ static void log_assert(int level, const char *text, const char *file, int line,
         char_array_0(buffer);
         log_abort_msg = buffer;
 
         char_array_0(buffer);
         log_abort_msg = buffer;
 

-        log_dispatch(level, file, line, func, NULL, NULL, buffer);
+        log_dispatch(level, 0, file, line, func, NULL, NULL, buffer);

 }
 
 noreturn void log_assert_failed(const char *text, const char *file, int line, const char *func) {
 }
 
 noreturn void log_assert_failed(const char *text, const char *file, int line, const char *func) {


@@ -729,12 +756,13 @@ void log_assert_failed_return(const char *text, const char *file, int line, cons
 }
 
 int log_oom_internal(const char *file, int line, const char *func) {
 }
 
 int log_oom_internal(const char *file, int line, const char *func) {

-        log_meta(LOG_ERR, file, line, func, "Out of memory.");
+        log_meta(LOG_ERR, ENOMEM, file, line, func, "Out of memory.");

         return -ENOMEM;
 }
 
 int log_struct_internal(
                 int level,
         return -ENOMEM;
 }
 
 int log_struct_internal(
                 int level,

+                int error,

                 const char *file,
                 int line,
                 const char *func,
                 const char *file,
                 int line,
                 const char *func,


@@ -767,8 +795,7 @@ int log_struct_internal(
                 static const char nl = '\n';
 
                 /* If the journal is available do structured logging */
                 static const char nl = '\n';
 
                 /* If the journal is available do structured logging */

-                log_do_header(header, sizeof(header), level,
-                              file, line, func, NULL, NULL);
+                log_do_header(header, sizeof(header), level, error, file, line, func, NULL, NULL);

                 IOVEC_SET_STRING(iovec[n++], header);
 
                 va_start(ap, format);
                 IOVEC_SET_STRING(iovec[n++], header);
 
                 va_start(ap, format);


@@ -840,8 +867,7 @@ int log_struct_internal(
                 va_end(ap);
 
                 if (found)
                 va_end(ap);
 
                 if (found)

-                        r = log_dispatch(level, file, line, func,
-                                         NULL, NULL, buf + 8);
+                        r = log_dispatch(level, error, file, line, func, NULL, NULL, buf + 8);

                 else
                         r = -EINVAL;
         }
                 else
                         r = -EINVAL;
         }

diff --git a/src/shared/log.h b/src/shared/log.h
index 8141e9dbb0349129ea586739b956cbbdd3f98afe..9dd68df500fde3f4458f15872ed788440a40a134 100644 (file)
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -77,44 +77,49 @@ void log_parse_environment(void);
 
 int log_meta(
                 int level,
 
 int log_meta(
                 int level,

+                int error,

                 const char*file,
                 int line,
                 const char *func,
                 const char*file,
                 int line,
                 const char *func,

-                const char *format, ...) _printf_(5,6);
+                const char *format, ...) _printf_(6,7);

 
 int log_metav(
                 int level,
 
 int log_metav(
                 int level,

+                int error,

                 const char*file,
                 int line,
                 const char *func,
                 const char *format,
                 const char*file,
                 int line,
                 const char *func,
                 const char *format,

-                va_list ap) _printf_(5,0);
+                va_list ap) _printf_(6,0);

 
 int log_meta_object(
                 int level,
 
 int log_meta_object(
                 int level,

+                int error,

                 const char*file,
                 int line,
                 const char *func,
                 const char *object_name,
                 const char *object,
                 const char*file,
                 int line,
                 const char *func,
                 const char *object_name,
                 const char *object,

-                const char *format, ...) _printf_(7,8);
+                const char *format, ...) _printf_(8,9);

 
 int log_metav_object(
                 int level,
 
 int log_metav_object(
                 int level,

+                int error,

                 const char*file,
                 int line,
                 const char *func,
                 const char *object_name,
                 const char *object,
                 const char *format,
                 const char*file,
                 int line,
                 const char *func,
                 const char *object_name,
                 const char *object,
                 const char *format,

-                va_list ap) _printf_(7,0);
+                va_list ap) _printf_(8,0);

 
 int log_struct_internal(
                 int level,
 
 int log_struct_internal(
                 int level,

+                int error,

                 const char *file,
                 int line,
                 const char *func,
                 const char *file,
                 int line,
                 const char *func,

-                const char *format, ...) _printf_(5,0) _sentinel_;
+                const char *format, ...) _printf_(6,0) _sentinel_;

 
 int log_oom_internal(
                 const char *file,
 
 int log_oom_internal(
                 const char *file,


@@ -124,11 +129,13 @@ int log_oom_internal(
 /* This modifies the buffer passed! */
 int log_dump_internal(
                 int level,
 /* This modifies the buffer passed! */
 int log_dump_internal(
                 int level,

+                int error,

                 const char*file,
                 int line,
                 const char *func,
                 char *buffer);
 
                 const char*file,
                 int line,
                 const char *func,
                 char *buffer);
 

+/* Logging for various assertions */

 noreturn void log_assert_failed(
                 const char *text,
                 const char *file,
 noreturn void log_assert_failed(
                 const char *text,
                 const char *file,


@@ -147,12 +154,16 @@ void log_assert_failed_return(
                 int line,
                 const char *func);
 
                 int line,
                 const char *func);
 

-#define log_full(level, ...) \
-do { \
-        if (log_get_max_level() >= (level)) \
-                log_meta((level), __FILE__, __LINE__, __func__, __VA_ARGS__); \
-} while (0)
+/* Logging with level */
+#define log_full_errno(level, error, ...)                               \
+        do {                                                            \
+                if (log_get_max_level() >= (level))                     \
+                        log_meta((level), error, __FILE__, __LINE__, __func__, __VA_ARGS__); \
+        } while (false)

 
 

+#define log_full(level, ...) log_full_errno(level, 0, __VA_ARGS__)
+
+/* Normal logging */

 #define log_debug(...)     log_full(LOG_DEBUG,   __VA_ARGS__)
 #define log_info(...)      log_full(LOG_INFO,    __VA_ARGS__)
 #define log_notice(...)    log_full(LOG_NOTICE,  __VA_ARGS__)
 #define log_debug(...)     log_full(LOG_DEBUG,   __VA_ARGS__)
 #define log_info(...)      log_full(LOG_INFO,    __VA_ARGS__)
 #define log_notice(...)    log_full(LOG_NOTICE,  __VA_ARGS__)


@@ -160,18 +171,28 @@ do { \
 #define log_error(...)     log_full(LOG_ERR,     __VA_ARGS__)
 #define log_emergency(...) log_full(getpid() == 1 ? LOG_EMERG : LOG_ERR, __VA_ARGS__)
 
 #define log_error(...)     log_full(LOG_ERR,     __VA_ARGS__)
 #define log_emergency(...) log_full(getpid() == 1 ? LOG_EMERG : LOG_ERR, __VA_ARGS__)
 

+/* Logging triggered by an errno-like error */
+#define log_debug_errno(error, ...)     log_full_errno(LOG_DEBUG,   error, __VA_ARGS__)
+#define log_info_errno(error, ...)      log_full_errno(LOG_INFO,    error, __VA_ARGS__)
+#define log_notice_errno(error, ...)    log_full_errno(LOG_NOTICE,  error, __VA_ARGS__)
+#define log_warning_errno(error, ...)   log_full_errno(LOG_WARNING, error, __VA_ARGS__)
+#define log_error_errno(error, ...)     log_full_errno(LOG_ERR,     error, __VA_ARGS__)
+#define log_emergency_errno(error, ...) log_full_errno(getpid() == 1 ? LOG_EMERG : LOG_ERR, __VA_ARGS__)
+

 #ifdef LOG_TRACE
 #  define log_trace(...) log_debug(__VA_ARGS__)
 #else
 #  define log_trace(...) do {} while(0)
 #endif
 
 #ifdef LOG_TRACE
 #  define log_trace(...) log_debug(__VA_ARGS__)
 #else
 #  define log_trace(...) do {} while(0)
 #endif
 

-#define log_struct(level, ...) log_struct_internal(level, __FILE__, __LINE__, __func__, __VA_ARGS__)
-
-#define log_oom() log_oom_internal(__FILE__, __LINE__, __func__)
+/* Structured logging */
+#define log_struct(level, ...) log_struct_internal(level, 0, __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define log_struct_errno(level, error, ...) log_struct_internal(level, error, __FILE__, __LINE__, __func__, __VA_ARGS__)

 
 /* This modifies the buffer passed! */
 
 /* This modifies the buffer passed! */

-#define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer)
+#define log_dump(level, buffer) log_dump_internal(level, 0, __FILE__, __LINE__, __func__, buffer)
+
+#define log_oom() log_oom_internal(__FILE__, __LINE__, __func__)

 
 bool log_on_console(void) _pure_;
 
 
 bool log_on_console(void) _pure_;
 

diff --git a/src/test/test-hostname.c b/src/test/test-hostname.c
index ad4f2856190878cc120b10b276e37ba61abd8dd0..1bc4126590b529938f2eb8f21a62495e2f39cb5c 100644 (file)
--- a/src/test/test-hostname.c
+++ b/src/test/test-hostname.c
@@ -32,7 +32,7 @@ int main(int argc, char* argv[]) {
 
         r = hostname_setup();
         if (r < 0)
 
         r = hostname_setup();
         if (r < 0)

-                fprintf(stderr, "hostname: %s\n", strerror(-r));
+                log_error_errno(-r, "hostname: %m");

 
         return 0;
 }
 
         return 0;
 }

diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
index 66807b381bd857520c4607508c99552e00668acc..f3d164763d0c7f91862496e65eab04ec0256cc50 100644 (file)
--- a/src/udev/udev-builtin-kmod.c
+++ b/src/udev/udev-builtin-kmod.c
@@ -31,7 +31,7 @@
 
 #include "udev.h"
 
 
 #include "udev.h"
 

-static struct kmod_ctx *ctx;
+static struct kmod_ctx *ctx = NULL;

 
 static int load_module(struct udev *udev, const char *alias) {
         struct kmod_list *list = NULL;
 
 static int load_module(struct udev *udev, const char *alias) {
         struct kmod_list *list = NULL;


@@ -43,18 +43,18 @@ static int load_module(struct udev *udev, const char *alias) {
                 return err;
 
         if (list == NULL)
                 return err;
 
         if (list == NULL)

-                log_debug("no module matches '%s'", alias);
+                log_debug("No module matches '%s'", alias);

 
         kmod_list_foreach(l, list) {
                 struct kmod_module *mod = kmod_module_get_module(l);
 
                 err = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST, NULL, NULL, NULL, NULL);
                 if (err == KMOD_PROBE_APPLY_BLACKLIST)
 
         kmod_list_foreach(l, list) {
                 struct kmod_module *mod = kmod_module_get_module(l);
 
                 err = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST, NULL, NULL, NULL, NULL);
                 if (err == KMOD_PROBE_APPLY_BLACKLIST)

-                        log_debug("module '%s' is blacklisted", kmod_module_get_name(mod));
+                        log_debug("Module '%s' is blacklisted", kmod_module_get_name(mod));

                 else if (err == 0)
                 else if (err == 0)

-                        log_debug("inserted '%s'", kmod_module_get_name(mod));
+                        log_debug("Inserted '%s'", kmod_module_get_name(mod));

                 else
                 else

-                        log_debug("failed to insert '%s'", kmod_module_get_name(mod));
+                        log_debug("Failed to insert '%s'", kmod_module_get_name(mod));

 
                 kmod_module_unref(mod);
         }
 
                 kmod_module_unref(mod);
         }


@@ -63,10 +63,8 @@ static int load_module(struct udev *udev, const char *alias) {
         return err;
 }
 
         return err;
 }
 

-_printf_(6,0)
-static void udev_kmod_log(void *data, int priority, const char *file, int line,
-                          const char *fn, const char *format, va_list args) {
-        log_metav(priority, file, line, fn, format, args);
+_printf_(6,0) static void udev_kmod_log(void *data, int priority, const char *file, int line, const char *fn, const char *format, va_list args) {
+        log_metav(priority, 0, file, line, fn, format, args);

 }
 
 static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test) {
 }
 
 static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test) {


@@ -82,7 +80,7 @@ static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool te
         }
 
         for (i = 2; argv[i]; i++) {
         }
 
         for (i = 2; argv[i]; i++) {

-                log_debug("execute '%s' '%s'", argv[1], argv[i]);
+                log_debug("Execute '%s' '%s'", argv[1], argv[i]);

                 load_module(udev, argv[i]);
         }
 
                 load_module(udev, argv[i]);
         }
 


@@ -98,7 +96,7 @@ static int builtin_kmod_init(struct udev *udev) {
         if (!ctx)
                 return -ENOMEM;
 
         if (!ctx)
                 return -ENOMEM;
 

-        log_debug("load module index");
+        log_debug("Load module index");

         kmod_set_log_fn(ctx, udev_kmod_log, udev);
         kmod_load_resources(ctx);
         return 0;
         kmod_set_log_fn(ctx, udev_kmod_log, udev);
         kmod_load_resources(ctx);
         return 0;


@@ -106,13 +104,13 @@ static int builtin_kmod_init(struct udev *udev) {
 
 /* called on udev shutdown and reload request */
 static void builtin_kmod_exit(struct udev *udev) {
 
 /* called on udev shutdown and reload request */
 static void builtin_kmod_exit(struct udev *udev) {

-        log_debug("unload module index");
+        log_debug("Unload module index");

         ctx = kmod_unref(ctx);
 }
 
 /* called every couple of seconds during event activity; 'true' if config has changed */
 static bool builtin_kmod_validate(struct udev *udev) {
         ctx = kmod_unref(ctx);
 }
 
 /* called every couple of seconds during event activity; 'true' if config has changed */
 static bool builtin_kmod_validate(struct udev *udev) {

-        log_debug("validate module index");
+        log_debug("Validate module index");

         if (!ctx)
                 return false;
         return (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK);
         if (!ctx)
                 return false;
         return (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK);