fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 00:37:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Netif: improves code quality

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
李通洲
2026-04-28 00:48:09 +08:00
parent e1dffe794b
commit 414f7ce067
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/impl/netif_apple.c
+4 -4
View File
@@ -25,8 +25,8 @@ get_rt_address(struct rt_msghdr* rtm, int desired) {
struct sockaddr* sa = (struct sockaddr*) (rtm + 1);
for (int i = 0; i < RTAX_MAX; i++) {
if (rtm->rtm_addrs & (1 << i)) {
if ((1 << i) == desired) {
if (rtm->rtm_addrs & (1u << i)) {
if ((1u << i) == (unsigned) desired) {
return sa;
}
@@ -110,7 +110,7 @@ bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) {
&& sdl->sdl_len
#endif
) {
assert(sdl->sdl_nlen <= IF_NAMESIZE);
if (sdl->sdl_nlen > IF_NAMESIZE) return false;
memcpy(result->ifName, sdl->sdl_data, sdl->sdl_nlen);
result->ifName[sdl->sdl_nlen] = '\0';
result->ifIndex = sdl->sdl_index;
@@ -183,7 +183,7 @@ bool ffNetifGetDefaultRouteImplV6(FFNetifDefaultRouteResult* result) {
&& sdl->sdl_len
#endif
) {
assert(sdl->sdl_nlen <= IF_NAMESIZE);
if (sdl->sdl_nlen > IF_NAMESIZE) return false;
memcpy(result->ifName, sdl->sdl_data, sdl->sdl_nlen);
result->ifName[sdl->sdl_nlen] = '\0';
result->ifIndex = sdl->sdl_index;
src/common/impl/netif_bsd.c
+4 -4
View File
@@ -32,8 +32,8 @@ get_rt_address(struct rt_msghdr* rtm, int desired) {
struct sockaddr* sa = (struct sockaddr*) (rtm + 1);
for (int i = 0; i < RTAX_MAX; i++) {
if (rtm->rtm_addrs & (1 << i)) {
if ((1 << i) == desired) {
if (rtm->rtm_addrs & (1u << i)) {
if ((1u << i) == (unsigned) desired) {
return sa;
}
sa = (struct sockaddr*) (ROUNDUP(sa->sa_len) + (char*) sa);
@@ -65,7 +65,7 @@ bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) {
if ((rtm->rtm_flags & RTF_GATEWAY) && !(rtm->rtm_flags & RTF_REJECT) && (sa->sa_family == AF_INET)) {
struct sockaddr_dl* sdl = (struct sockaddr_dl*) get_rt_address(rtm, RTA_IFP);
if (sdl && sdl->sdl_family == AF_LINK) {
assert(sdl->sdl_nlen <= IF_NAMESIZE);
if (sdl->sdl_nlen > IF_NAMESIZE) continue;
memcpy(result->ifName, sdl->sdl_data, sdl->sdl_nlen);
result->ifName[sdl->sdl_nlen] = '\0';
result->ifIndex = sdl->sdl_index;
@@ -106,7 +106,7 @@ bool ffNetifGetDefaultRouteImplV6(FFNetifDefaultRouteResult* result) {
if ((rtm->rtm_flags & RTF_GATEWAY) && !(rtm->rtm_flags & RTF_REJECT) && (sa->sa_family == AF_INET6)) {
struct sockaddr_dl* sdl = (struct sockaddr_dl*) get_rt_address(rtm, RTA_IFP);
if (sdl && sdl->sdl_family == AF_LINK) {
assert(sdl->sdl_nlen <= IF_NAMESIZE);
if (sdl->sdl_nlen > IF_NAMESIZE) continue;
memcpy(result->ifName, sdl->sdl_data, sdl->sdl_nlen);
result->ifName[sdl->sdl_nlen] = '\0';
result->ifIndex = sdl->sdl_index;
src/common/impl/netif_gnu.c
+1 -1
View File
@@ -25,7 +25,7 @@ bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) {
// TODO: Get the preferred source address
return true;
}
result->ifName[0] = '0';
result->ifName[0] = '\0';
return false;
}
src/common/impl/netif_haiku.c
+1 -1
View File
@@ -71,7 +71,7 @@ bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) {
}
bool ffNetifGetDefaultRouteImplV6(FFNetifDefaultRouteResult* result) {
FF_AUTO_CLOSE_FD int pfRoute = socket(AF_INET, SOCK_RAW, AF_INET6);
FF_AUTO_CLOSE_FD int pfRoute = socket(AF_INET6, SOCK_RAW, AF_INET6);
if (pfRoute < 0) {
return false;
}