move addr

qingyan01 · web-flow · commit 2ed1cf906897 · 2024-05-07T11:43:09.000+08:00
diff --git a/src/common/network/NetworkUtils.cpp b/src/common/network/NetworkUtils.cpp
@@ -65,12 +65,11 @@ StatusOr<std::vector<std::pair<std::string, std::string>>> NetworkUtils::listDev
     return Status::Error("%s", ::strerror(errno));
   }
   for (auto* ifa = iflist; ifa != nullptr; ifa = ifa->ifa_next) {
-    auto* addr = ifa->ifa_addr;
+    auto* addr = reinterpret_cast<struct sockaddr_in*>(ifa->ifa_addr);
     // Skip non-IPv4 devices
     if (nullptr == addr || addr->sa_family != AF_INET) {
       continue;
     }
-    auto* addr = reinterpret_cast<struct sockaddr_in*>(ifa->ifa_addr);
     // inet_ntoa is thread safe but not re-entrant,
     // we could use inet_ntop instead when we need support for IPv6
     dev2ipv4s.emplace_back(ifa->ifa_name, ::inet_ntoa(addr->sin_addr));

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,11 @@ StatusOr<std::vector<std::pair<std::string, std::string>>> NetworkUtils::listDev`
`65`	`65`	`return Status::Error("%s", ::strerror(errno));`
`66`	`66`	`}`
`67`	`67`	`for (auto* ifa = iflist; ifa != nullptr; ifa = ifa->ifa_next) {`
`68`		`- auto* addr = ifa->ifa_addr;`
	`68`	`+ auto* addr = reinterpret_cast<struct sockaddr_in*>(ifa->ifa_addr);`
`69`	`69`	`// Skip non-IPv4 devices`
`70`	`70`	`if (nullptr == addr \|\| addr->sa_family != AF_INET) {`
`71`	`71`	`continue;`
`72`	`72`	`}`
`73`		`- auto* addr = reinterpret_cast<struct sockaddr_in*>(ifa->ifa_addr);`
`74`	`73`	`// inet_ntoa is thread safe but not re-entrant,`
`75`	`74`	`// we could use inet_ntop instead when we need support for IPv6`
`76`	`75`	`dev2ipv4s.emplace_back(ifa->ifa_name, ::inet_ntoa(addr->sin_addr));`