networkctl: remove unused variable

[elogind.git] / src / network / networkctl.c

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 91eb6357d40d58e1ae4f41705ff34c4c9625d141..3e304b261f147d8a8ff6144896d8b0d558c137a5 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -34,6 +34,7 @@
 #include "arphrd-list.h"
 #include "local-addresses.h"
 #include "socket-util.h"
+#include "ether-addr-util.h"
 
 static bool arg_no_pager = false;
 static bool arg_legend = true;
@@ -251,14 +252,13 @@ static int list_links(char **args, unsigned n) {
 static int ieee_oui(struct udev_hwdb *hwdb, struct ether_addr *mac, char **ret) {
         struct udev_list_entry *entry;
         char *description;
-        char str[32];
+        char str[strlen("OUI:XXYYXXYYXXYY") + 1];
 
         /* skip commonly misused 00:00:00 (Xerox) prefix */
         if (memcmp(mac, "\0\0\0", 3) == 0)
                 return -EINVAL;
 
-        snprintf(str, sizeof(str), "OUI:%02X%02X%02X%02X%02X%02X", mac->ether_addr_octet[0], mac->ether_addr_octet[1], mac->ether_addr_octet[2],
-                                                                   mac->ether_addr_octet[3], mac->ether_addr_octet[4], mac->ether_addr_octet[5]);
+        snprintf(str, sizeof(str), "OUI:" ETHER_ADDR_FORMAT_STR, ETHER_ADDR_FORMAT_VAL(*mac));
 
         udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, str, 0))
                 if (strcmp(udev_list_entry_get_name(entry), "ID_OUI_FROM_DATABASE") == 0) {
@@ -333,7 +333,7 @@ static int get_gateway_description(sd_rtnl *rtnl, struct udev_hwdb *hwdb, int if
 
                 r = sd_rtnl_message_neigh_get_ifindex(m, &ifi);
                 if (r < 0) {
-                        log_error_errno(r, "colud not get ifindex: %m");
+                        log_error_errno(r, "could not get ifindex: %m");
                         continue;
                 }
 
@@ -427,7 +427,7 @@ static int dump_gateways(sd_rtnl *rtnl, struct udev_hwdb *hwdb, const char *pref
 
                 r = sd_rtnl_message_read_u32(m, RTA_OIF, &ifi);
                 if (r < 0) {
-                        log_error_errno(r, "colud not get RTA_OIF: %m");
+                        log_error_errno(r, "could not get RTA_OIF: %m");
                         continue;
                 }
 
@@ -529,8 +529,7 @@ static void dump_list(const char *prefix, char **l) {
 
 static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
-        _cleanup_free_ char *setup_state = NULL, *operational_state = NULL, *gateway = NULL, *gateway_description = NULL,
-                            *gateway6 = NULL, *gateway6_description = NULL;
+        _cleanup_free_ char *setup_state = NULL, *operational_state = NULL;
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         _cleanup_udev_device_unref_ struct udev_device *d = NULL;
         _cleanup_udev_hwdb_unref_ struct udev_hwdb *hwdb = NULL;