network: use GNU-ism to simplify macros

Thanks David!

diff --git a/src/network/networkd-bridge.c b/src/network/networkd-bridge.c
index d644bd5f55746e89048980c15f83a20b6039997d..fa87d3e24ceb583bad890e470907706a4814421b 100644 (file)
--- a/src/network/networkd-bridge.c
+++ b/src/network/networkd-bridge.c
@@ -116,7 +116,7 @@ static int bridge_enter_ready(Bridge *bridge) {
 
         bridge->state = BRIDGE_STATE_READY;
 
 
         bridge->state = BRIDGE_STATE_READY;
 

-        log_bridge_info(bridge, "bridge ready");
+        log_info_bridge(bridge, "bridge ready");

 
         LIST_FOREACH(callbacks, callback, bridge->callbacks) {
                 /* join the links that were attempted to be joined befor the
 
         LIST_FOREACH(callbacks, callback, bridge->callbacks) {
                 /* join the links that were attempted to be joined befor the


@@ -206,7 +206,7 @@ static int bridge_create(Bridge *bridge) {
                 return r;
         }
 
                 return r;
         }
 

-        log_bridge_debug(bridge, "creating bridge");
+        log_debug_bridge(bridge, "creating bridge");

 
         bridge->state = BRIDGE_STATE_CREATING;
 
 
         bridge->state = BRIDGE_STATE_CREATING;
 

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 3c683a0ce0fa0ec8bafa2eabd98cb4130236f650..52b023cd9e3b686b1d9befb148a34a685e511e64 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -134,7 +134,7 @@ static int link_enter_configured(Link *link) {
         assert(link);
         assert(link->state == LINK_STATE_SETTING_ROUTES);
 
         assert(link);
         assert(link->state == LINK_STATE_SETTING_ROUTES);
 

-        log_link_info(link, "link configured");
+        log_info_link(link, "link configured");

 
         link->state = LINK_STATE_CONFIGURED;
 
 
         link->state = LINK_STATE_CONFIGURED;
 


@@ -144,7 +144,7 @@ static int link_enter_configured(Link *link) {
 static void link_enter_failed(Link *link) {
         assert(link);
 
 static void link_enter_failed(Link *link) {
         assert(link);
 

-        log_link_warning(link, "failed");
+        log_warning_link(link, "failed");

 
         link->state = LINK_STATE_FAILED;
 }
 
         link->state = LINK_STATE_FAILED;
 }


@@ -170,7 +170,7 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         /* we might have received an old reply after moving back to SETTING_ADDRESSES,
          * ignore it */
         if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {
         /* we might have received an old reply after moving back to SETTING_ADDRESSES,
          * ignore it */
         if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {

-                log_link_debug(link, "routes set");
+                log_debug_link(link, "routes set");

                 link_enter_configured(link);
         }
 
                 link_enter_configured(link);
         }
 


@@ -190,7 +190,7 @@ static int link_enter_set_routes(Link *link) {
         if (!link->network->static_routes && !link->dhcp_route)
                 return link_enter_configured(link);
 
         if (!link->network->static_routes && !link->dhcp_route)
                 return link_enter_configured(link);
 

-        log_link_debug(link, "setting routes");
+        log_debug_link(link, "setting routes");

 
         LIST_FOREACH(static_routes, route, link->network->static_routes) {
                 r = route_configure(route, link, &route_handler);
 
         LIST_FOREACH(static_routes, route, link->network->static_routes) {
                 r = route_configure(route, link, &route_handler);


@@ -243,7 +243,7 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                                 NULL);
 
         if (link->addr_messages == 0) {
                                 NULL);
 
         if (link->addr_messages == 0) {

-                log_link_debug(link, "addresses set");
+                log_debug_link(link, "addresses set");

                 link_enter_set_routes(link);
         }
 
                 link_enter_set_routes(link);
         }
 


@@ -263,7 +263,7 @@ static int link_enter_set_addresses(Link *link) {
         if (!link->network->static_addresses && !link->dhcp_address)
                 return link_enter_set_routes(link);
 
         if (!link->network->static_addresses && !link->dhcp_address)
                 return link_enter_set_routes(link);
 

-        log_link_debug(link, "setting addresses");
+        log_debug_link(link, "setting addresses");

 
         LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
                 r = address_configure(address, link, &address_handler);
 
         LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
                 r = address_configure(address, link, &address_handler);


@@ -330,7 +330,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
         }
 
         if (event == DHCP_EVENT_NO_LEASE)
         }
 
         if (event == DHCP_EVENT_NO_LEASE)

-                log_link_debug(link, "IP address in use.");
+                log_debug_link(link, "IP address in use.");

 
         if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
             event == DHCP_EVENT_STOP) {
 
         if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
             event == DHCP_EVENT_STOP) {


@@ -349,28 +349,28 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
 
         r = sd_dhcp_client_get_address(client, &address);
         if (r < 0) {
 
         r = sd_dhcp_client_get_address(client, &address);
         if (r < 0) {

-                log_link_warning(link, "DHCP error: no address");
+                log_warning_link(link, "DHCP error: no address");

                 link_enter_failed(link);
                 return;
         }
 
         r = sd_dhcp_client_get_netmask(client, &netmask);
         if (r < 0) {
                 link_enter_failed(link);
                 return;
         }
 
         r = sd_dhcp_client_get_netmask(client, &netmask);
         if (r < 0) {

-                log_link_warning(link, "DHCP error: no netmask");
+                log_warning_link(link, "DHCP error: no netmask");

                 link_enter_failed(link);
                 return;
         }
 
         prefixlen = sd_dhcp_client_prefixlen(&netmask);
         if (prefixlen < 0) {
                 link_enter_failed(link);
                 return;
         }
 
         prefixlen = sd_dhcp_client_prefixlen(&netmask);
         if (prefixlen < 0) {

-                log_link_warning(link, "DHCP error: no prefixlen");
+                log_warning_link(link, "DHCP error: no prefixlen");

                 link_enter_failed(link);
                 return;
         }
 
         r = sd_dhcp_client_get_router(client, &gateway);
         if (r < 0) {
                 link_enter_failed(link);
                 return;
         }
 
         r = sd_dhcp_client_get_router(client, &gateway);
         if (r < 0) {

-                log_link_warning(link, "DHCP error: no router");
+                log_warning_link(link, "DHCP error: no router");

                 link_enter_failed(link);
                 return;
         }
                 link_enter_failed(link);
                 return;
         }


@@ -395,7 +395,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
 
                 r = address_new_dynamic(&addr);
                 if (r < 0) {
 
                 r = address_new_dynamic(&addr);
                 if (r < 0) {

-                        log_link_error(link, "Could not allocate address");
+                        log_error_link(link, "Could not allocate address");

                         link_enter_failed(link);
                         return;
                 }
                         link_enter_failed(link);
                         return;
                 }


@@ -407,7 +407,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
 
                 r = route_new_dynamic(&rt);
                 if (r < 0) {
 
                 r = route_new_dynamic(&rt);
                 if (r < 0) {

-                        log_link_error(link, "Could not allocate route");
+                        log_error_link(link, "Could not allocate route");

                         link_enter_failed(link);
                         return;
                 }
                         link_enter_failed(link);
                         return;
                 }


@@ -480,7 +480,7 @@ static int link_update_flags(Link *link, unsigned flags) {
 
         if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
                 if (flags & IFF_LOWER_UP) {
 
         if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
                 if (flags & IFF_LOWER_UP) {

-                        log_link_info(link, "carrier on");
+                        log_info_link(link, "carrier on");

 
                         if (link->network->dhcp) {
                                 r = link_acquire_conf(link);
 
                         if (link->network->dhcp) {
                                 r = link_acquire_conf(link);


@@ -490,7 +490,7 @@ static int link_update_flags(Link *link, unsigned flags) {
                                 }
                         }
                 } else {
                                 }
                         }
                 } else {

-                        log_link_info(link, "carrier off");
+                        log_info_link(link, "carrier off");

 
                         if (link->network->dhcp) {
                                 r = sd_dhcp_client_stop(link->dhcp);
 
                         if (link->network->dhcp) {
                                 r = sd_dhcp_client_stop(link->dhcp);


@@ -539,11 +539,11 @@ static int link_up(Link *link) {
         assert(link->manager);
         assert(link->manager->rtnl);
 
         assert(link->manager);
         assert(link->manager->rtnl);
 

-        log_link_debug(link, "bringing link up");
+        log_debug_link(link, "bringing link up");

 
         r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
         if (r < 0) {
 
         r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
         if (r < 0) {

-                log_link_error(link, "Could not allocate RTM_SETLINK message");
+                log_error_link(link, "Could not allocate RTM_SETLINK message");

                 return r;
         }
 
                 return r;
         }
 


@@ -631,7 +631,7 @@ static int link_enter_join_bridge(Link *link) {
                         link->network->bridge->name,
                         BRIDGE(link->network->bridge),
                         NULL);
                         link->network->bridge->name,
                         BRIDGE(link->network->bridge),
                         NULL);

-        log_link_debug(link, "joining bridge");
+        log_debug_link(link, "joining bridge");

 
         r = bridge_join(link->network->bridge, link, &bridge_handler);
         if (r < 0) {
 
         r = bridge_join(link->network->bridge, link, &bridge_handler);
         if (r < 0) {


@@ -662,7 +662,7 @@ static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 link_enter_failed(link);
         }
 
                 link_enter_failed(link);
         }
 

-        log_link_debug(link, "got link state");
+        log_debug_link(link, "got link state");

 
         link_update(link, m);
 
 
         link_update(link, m);
 


@@ -677,11 +677,11 @@ static int link_get(Link *link) {
         assert(link->manager);
         assert(link->manager->rtnl);
 
         assert(link->manager);
         assert(link->manager->rtnl);
 

-        log_link_debug(link, "requesting link status");
+        log_debug_link(link, "requesting link status");

 
         r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
         if (r < 0) {
 
         r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
         if (r < 0) {

-                log_link_error(link, "Could not allocate RTM_GETLINK message");
+                log_error_link(link, "Could not allocate RTM_GETLINK message");

                 return r;
         }
 
                 return r;
         }
 


@@ -723,7 +723,7 @@ int link_update(Link *link, sd_rtnl_message *m) {
 
         r = sd_rtnl_message_link_get_flags(m, &flags);
         if (r < 0) {
 
         r = sd_rtnl_message_link_get_flags(m, &flags);
         if (r < 0) {

-                log_link_warning(link, "could not get link flags");
+                log_warning_link(link, "could not get link flags");

                 return r;
         }
 
                 return r;
         }
 

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 2da852fea4a4e0cb694c4b62571be2df7ac68a37..4f44f78655597265a47a0f0e411d498dfd6292b4 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -281,37 +281,23 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 
 /* 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, 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_warning_link(link, ...)     log_full_link(LOG_WARNING, link, __VA_ARGS__)
-#define log_error_link(link, ...)       log_full_link(LOG_ERR, link, __VA_ARGS__)
-
-#define log_link_full(level, link, message) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%s: " message, link->ifname)
-#define log_link_debug(link, ...)       log_link_full(LOG_DEBUG, link, __VA_ARGS__)
-#define log_link_info(link, ...)        log_link_full(LOG_INFO, link, __VA_ARGS__)
-#define log_link_notice(link, ...)      log_link_full(LOG_NOTICE, link, __VA_ARGS__)
-#define log_link_warning(link, ...)     log_link_full(LOG_WARNING, link, __VA_ARGS__)
-#define log_link_error(link, ...)       log_link_full(LOG_ERR, link, __VA_ARGS__)
+#define log_full_link(level, link, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%s: " fmt, 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_warning_link(link, ...)     log_full_link(LOG_WARNING, link, ##__VA_ARGS__)
+#define log_error_link(link, ...)       log_full_link(LOG_ERR, link, ##__VA_ARGS__)

 
 #define log_struct_link(level, link, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__)
 
 /* More macros which append INTERFACE= to the message */
 
 
 #define log_struct_link(level, link, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__)
 
 /* More macros which append INTERFACE= to the message */
 

-#define log_full_bridge(level, bridge, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " fmt, bridge->name, __VA_ARGS__)
-#define log_debug_bridge(bridge, ...)       log_full_bridge(LOG_DEBUG, bridge, __VA_ARGS__)
-#define log_info_bridge(bridge, ...)        log_full_bridge(LOG_INFO, bridge, __VA_ARGS__)
-#define log_notice_bridge(bridge, ...)      log_full_bridge(LOG_NOTICE, bridge, __VA_ARGS__)
-#define log_warning_bridge(bridge, ...)     log_full_bridge(LOG_WARNING, bridge, __VA_ARGS__)
-#define log_error_bridge(bridge, ...)       log_full_bridge(LOG_ERR, bridge, __VA_ARGS__)
-
-#define log_bridge_full(level, bridge, message) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " message, bridge->name)
-#define log_bridge_debug(bridge, ...)       log_bridge_full(LOG_DEBUG, bridge, __VA_ARGS__)
-#define log_bridge_info(bridge, ...)        log_bridge_full(LOG_INFO, bridge, __VA_ARGS__)
-#define log_bridge_notice(bridge, ...)      log_bridge_full(LOG_NOTICE, bridge, __VA_ARGS__)
-#define log_bridge_warning(bridge, ...)     log_bridge_full(LOG_WARNING, bridge, __VA_ARGS__)
-#define log_bridge_error(bridge, ...)       log_bridge_full(LOG_ERR, bridge, __VA_ARGS__)
+#define log_full_bridge(level, bridge, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", bridge->name, "%s: " fmt, bridge->name, ##__VA_ARGS__)
+#define log_debug_bridge(bridge, ...)       log_full_bridge(LOG_DEBUG, bridge, ##__VA_ARGS__)
+#define log_info_bridge(bridge, ...)        log_full_bridge(LOG_INFO, bridge, ##__VA_ARGS__)
+#define log_notice_bridge(bridge, ...)      log_full_bridge(LOG_NOTICE, bridge, ##__VA_ARGS__)
+#define log_warning_bridge(bridge, ...)     log_full_bridge(LOG_WARNING, bridge,## __VA_ARGS__)
+#define log_error_bridge(bridge, ...)       log_full_bridge(LOG_ERR, bridge, ##__VA_ARGS__)

 
 #define log_struct_bridge(level, bridge, ...) log_struct(level, "INTERFACE=%s", bridge->name, __VA_ARGS__)
 
 
 #define log_struct_bridge(level, bridge, ...) log_struct(level, "INTERFACE=%s", bridge->name, __VA_ARGS__)