fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 10:52:08 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Wifi: code refactor; fix a silly copy & paste error

Browse Source
This commit is contained in:
李通洲
2023-01-17 15:52:51 +08:00
parent 68977be256
commit c746cde61e
3 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/wifi/wifi_apple.m
-3
View File
@@ -10,9 +10,6 @@ const char* ffDetectWifi(const FFinstance* instance, FFlist* result)
if(!interfaces)
return "CWWiFiClient.sharedWiFiClient.interfaces is nil";
if(interfaces.count == 0)
return "No wifi interfaces found";
for(CWInterface* inf in interfaces)
{
FFWifiResult* item = (FFWifiResult*)ffListAdd(result);
src/detection/wifi/wifi_windows.c
-6
View File
@@ -66,12 +66,6 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* res
goto exit;
}
if(ifList->dwNumberOfItems == 0)
{
error = "No wifi interfaces found";
goto exit;
}
for(uint32_t index = 0; index < ifList->dwNumberOfItems; ++index)
{
WLAN_INTERFACE_INFO* ifInfo = (WLAN_INTERFACE_INFO*)&ifList->InterfaceInfo[index];
src/modules/wifi.c
+47 -44
View File
@@ -11,57 +11,60 @@ void ffPrintWifi(FFinstance* instance)
ffListInit(&result, sizeof(FFWifiResult));
const char* error = ffDetectWifi(instance, &result);
if(!error)
if(error)
{
for(uint32_t index = 0; index < result.length; ++index)
{
FFWifiResult* item = (FFWifiResult*)ffListGet(&result, index);
uint8_t moduleIndex = result.length == 1 ? 0 : (uint8_t)(index + 1);
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wifi, "%s", error);
return;
}
if(!result.length)
{
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wifi, "No Wifi interfaces found");
return;
}
if(instance->config.wifi.outputFormat.length == 0)
for(uint32_t index = 0; index < result.length; ++index)
{
FFWifiResult* item = (FFWifiResult*)ffListGet(&result, index);
uint8_t moduleIndex = result.length == 1 ? 0 : (uint8_t)(index + 1);
if(instance->config.wifi.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi.key);
if(item->conn.ssid.length)
{
ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi.key);
if(item->conn.ssid.length)
{
printf("%s - %s - %s\n",
item->conn.ssid.chars,
item->conn.protocol.chars,
item->conn.security.length > 0 ? item->conn.security.chars : "insecure"
);
}
else
{
puts(item->inf.status.chars);
}
printf("%s - %s - %s\n",
item->conn.ssid.chars,
item->conn.protocol.chars,
item->conn.security.length > 0 ? item->conn.security.chars : "insecure"
);
}
else
{
ffPrintFormat(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi, FF_WIFI_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.description},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.ssid},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.macAddress},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.protocol},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.signalQuality},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.rxRate},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.txRate},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.security},
});
puts(item->inf.status.chars);
}
ffStrbufDestroy(&item->inf.description);
ffStrbufDestroy(&item->inf.status);
ffStrbufDestroy(&item->conn.status);
ffStrbufDestroy(&item->conn.ssid);
ffStrbufDestroy(&item->conn.macAddress);
ffStrbufDestroy(&item->conn.protocol);
ffStrbufDestroy(&item->conn.security);
}
}
else
{
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wmTheme, "%s", error);
else
{
ffPrintFormat(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi, FF_WIFI_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.description},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.ssid},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.macAddress},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.protocol},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.signalQuality},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.rxRate},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.txRate},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.security},
});
}
ffStrbufDestroy(&item->inf.description);
ffStrbufDestroy(&item->inf.status);
ffStrbufDestroy(&item->conn.status);
ffStrbufDestroy(&item->conn.ssid);
ffStrbufDestroy(&item->conn.macAddress);
ffStrbufDestroy(&item->conn.protocol);
ffStrbufDestroy(&item->conn.security);
}
}