diff options
| author | Patrick Venture <venture@google.com> | 2018-09-11 17:36:03 -0700 |
|---|---|---|
| committer | Ratan Gupta <ratagupt@linux.vnet.ibm.com> | 2018-11-21 09:10:55 +0000 |
| commit | 836c91daea698a9ff2dc9a79112a6e29d1d69732 (patch) | |
| tree | 13475c187f0a9b4f6f9dd626f46ec4068753741d | |
| parent | 798c28119c9e2c8ca964ed9a1eae878a2bb74a2a (diff) | |
| download | phosphor-networkd-836c91daea698a9ff2dc9a79112a6e29d1d69732.tar.gz phosphor-networkd-836c91daea698a9ff2dc9a79112a6e29d1d69732.zip | |
minor cleanup, std namespacing, dropping headers
Added std namespace to places where there is a cpp version, and dropped
unused c headers where found.
Change-Id: Ife538ad73042b020ee2987b70e1f021b9926b2bf
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | ethernet_interface.cpp | 10 | ||||
| -rw-r--r-- | routing_table.cpp | 3 | ||||
| -rw-r--r-- | rtnetlink_server.cpp | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ethernet_interface.cpp b/ethernet_interface.cpp index 3fd7835..893cd4c 100644 --- a/ethernet_interface.cpp +++ b/ethernet_interface.cpp @@ -214,7 +214,7 @@ std::string return macAddress; } - strcpy(ifr.ifr_name, interfaceName.c_str()); + std::strcpy(ifr.ifr_name, interfaceName.c_str()); if (ioctl(sock, SIOCGIFHWADDR, &ifr) != 0) { log<level::ERR>("ioctl failed for SIOCGIFHWADDR:", @@ -222,10 +222,10 @@ std::string return macAddress; } - snprintf(macAddress, mac_address::size, mac_address::format, - ifr.ifr_hwaddr.sa_data[0], ifr.ifr_hwaddr.sa_data[1], - ifr.ifr_hwaddr.sa_data[2], ifr.ifr_hwaddr.sa_data[3], - ifr.ifr_hwaddr.sa_data[4], ifr.ifr_hwaddr.sa_data[5]); + std::snprintf(macAddress, mac_address::size, mac_address::format, + ifr.ifr_hwaddr.sa_data[0], ifr.ifr_hwaddr.sa_data[1], + ifr.ifr_hwaddr.sa_data[2], ifr.ifr_hwaddr.sa_data[3], + ifr.ifr_hwaddr.sa_data[4], ifr.ifr_hwaddr.sa_data[5]); return macAddress; } diff --git a/routing_table.cpp b/routing_table.cpp index 6a17037..ff5e3f4 100644 --- a/routing_table.cpp +++ b/routing_table.cpp @@ -6,9 +6,6 @@ #include <linux/rtnetlink.h> #include <net/if.h> #include <netinet/in.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/types.h> diff --git a/rtnetlink_server.cpp b/rtnetlink_server.cpp index 2e2436b..ed5f8c9 100644 --- a/rtnetlink_server.cpp +++ b/rtnetlink_server.cpp @@ -107,7 +107,7 @@ Server::Server(EventPtr& eventPtr, const phosphor::Descriptor& smartSock) goto finish; } - memset(&addr, 0, sizeof(addr)); + std::memset(&addr, 0, sizeof(addr)); addr.nl_family = AF_NETLINK; addr.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR; |
