From 40e977be31de9442d7d5bae4058a31ac056fd8af Mon Sep 17 00:00:00 2001 From: Marius Messerschmidt Date: Sat, 18 Nov 2023 15:33:23 +0100 Subject: [PATCH] Spelling: fix spelling of files in src/detection/ --- src/detection/disk/disk_linux.c | 2 +- src/detection/diskio/diskio_linux.c | 2 +- src/detection/displayserver/linux/displayserver_linux.c | 2 +- src/detection/displayserver/linux/wmde.c | 2 +- src/detection/displayserver/linux/xlib.c | 2 +- src/detection/gamepad/gamepad_bsd.c | 4 ++-- src/detection/os/os_windows.cpp | 2 +- src/detection/temps/temps_windows.cpp | 2 +- src/detection/terminalfont/terminalfont_linux.c | 4 ++-- src/detection/terminalshell/terminalshell_linux.c | 2 +- src/detection/terminalshell/terminalshell_windows.c | 2 +- src/detection/vulkan/vulkan.c | 2 +- src/detection/wifi/wifi_apple.m | 2 +- src/detection/wmtheme/wmtheme_linux.c | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c index a04571d73..0cef2d64b 100644 --- a/src/detection/disk/disk_linux.c +++ b/src/detection/disk/disk_linux.c @@ -20,7 +20,7 @@ static bool isPhysicalDevice(const struct mntent* device) { - #ifndef __ANDROID__ //On Android, `/dev` is not accessable, so that the following checks always fail + #ifndef __ANDROID__ //On Android, `/dev` is not accessible, so that the following checks always fail //Always show the root path if(ffStrEquals(device->mnt_dir, "/")) diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c index 9ac39915d..fe505fd9e 100644 --- a/src/detection/diskio/diskio_linux.c +++ b/src/detection/diskio/diskio_linux.c @@ -24,7 +24,7 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options) if (part && isdigit(part[strlen("-part")])) continue; - if (ffStrStartsWith(entry->d_name, "nvme-eui.")) // NVMe drive indentifier + if (ffStrStartsWith(entry->d_name, "nvme-eui.")) // NVMe drive identifier continue; // Other exceptions? diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c index b0ceabfde..7f1167520 100644 --- a/src/detection/displayserver/linux/displayserver_linux.c +++ b/src/detection/displayserver/linux/displayserver_linux.c @@ -89,7 +89,7 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds) if (!instance.config.general.dsForceDrm) { - //We try wayland as our prefered display server, as it supports the most features. + //We try wayland as our preferred display server, as it supports the most features. //This method can't detect the name of our WM / DE ffdsConnectWayland(ds); diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index 87594ea10..740050b46 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -333,7 +333,7 @@ void ffdsDetectWMDE(FFDisplayServerResult* result) applyPrettyNameIfDE(result, env); //If WM was found by connection to the sever, and DE in the environment, we can return - //This way we never call getFromProcDir(), which has slow initalization time + //This way we never call getFromProcDir(), which has slow initialization time if(result->dePrettyName.length > 0 && result->wmPrettyName.length > 0) return; diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c index 6c52a4393..094b9e9e4 100644 --- a/src/detection/displayserver/linux/xlib.c +++ b/src/detection/displayserver/linux/xlib.c @@ -388,7 +388,7 @@ void ffdsConnectXrandr(FFDisplayServerResult* result) void ffdsConnectXrandr(FFDisplayServerResult* result) { - //Do nothing here. There are more x11 implementaions to come. + //Do nothing here. There are more x11 implementations to come. FF_UNUSED(result); } diff --git a/src/detection/gamepad/gamepad_bsd.c b/src/detection/gamepad/gamepad_bsd.c index 9ede2280b..ade8fb996 100644 --- a/src/detection/gamepad/gamepad_bsd.c +++ b/src/detection/gamepad/gamepad_bsd.c @@ -20,9 +20,9 @@ const char* ffDetectGamepad(FFlist* devices /* List of FFGamepadDevice */) report_desc_t repDesc = hid_get_report_desc(fd); if (!repDesc) continue; - int repId = hid_get_report_id(fd); + int reportId = hid_get_report_id(fd); - struct hid_data* hData = hid_start_parse(repDesc, 0, repId); + struct hid_data* hData = hid_start_parse(repDesc, 0, reportId); if (hData) { struct hid_item hItem; diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp index 935f86153..772f09500 100644 --- a/src/detection/os/os_windows.cpp +++ b/src/detection/os/os_windows.cpp @@ -58,7 +58,7 @@ void ffDetectOSImpl(FFOSResult* os) ffStrbufTrimRight(&os->variant, ' '); - //WMI returns the "Microsoft" prefix while BrandingFormatString doesn't. Make them consistant. + //WMI returns the "Microsoft" prefix while BrandingFormatString doesn't. Make them consistent. if(ffStrbufStartsWithS(&os->variant, "Microsoft ")) ffStrbufSubstrAfter(&os->variant, strlen("Microsoft ") - 1); diff --git a/src/detection/temps/temps_windows.cpp b/src/detection/temps/temps_windows.cpp index c9cfeac50..ac9fccab6 100644 --- a/src/detection/temps/temps_windows.cpp +++ b/src/detection/temps/temps_windows.cpp @@ -7,7 +7,7 @@ extern "C" extern "C" const char* ffDetectSmbiosTemp(double* current, double* critical) { - // Requires Administrator priviledges + // Requires Administrator privileges // https://wutils.com/wmi/root/wmi/msacpi_thermalzonetemperature/#properties FFWmiQuery query(L"SELECT CurrentTemperature, CriticalTripPoint FROM MSAcpi_ThermalZoneTemperature WHERE Active = TRUE", nullptr, FFWmiNamespace::WMI); if(!query) diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index e1d51a2f4..f320f50e3 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -45,7 +45,7 @@ static void detectKgx(FFTerminalFontResult* terminalFont) if(ffStrSet(fontName)) ffFontInitPango(&terminalFont->font, fontName); else - ffStrbufAppendS(&terminalFont->error, "Could't get system monospace font name from GSettings / DConf"); + ffStrbufAppendS(&terminalFont->error, "Couldn't get system monospace font name from GSettings / DConf"); } } @@ -77,7 +77,7 @@ static void detectFromGSettings(const char* profilePath, const char* profileList if(ffStrSet(fontName)) ffFontInitPango(&terminalFont->font, fontName); else - ffStrbufAppendS(&terminalFont->error, "Could't get system monospace font name from GSettings / DConf"); + ffStrbufAppendS(&terminalFont->error, "Couldn't get system monospace font name from GSettings / DConf"); } } diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index 91394faea..518f0df7f 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -368,7 +368,7 @@ const FFTerminalShellResult* ffDetectTerminalShell() if(result.terminalExeName[0] == '.' && ffStrEndsWith(result.terminalExeName, "-wrapped")) { // For NixOS. Ref: #510 and https://github.com/NixOS/nixpkgs/pull/249428 - // We use terminalProcessName when detecting version and font, overriding it for simplication + // We use terminalProcessName when detecting version and font, overriding it for simplification ffStrbufSetNS( &result.terminalProcessName, (uint32_t) (strlen(result.terminalExeName) - strlen(".-wrapped")), diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c index 04a3afecb..0f2f23c81 100644 --- a/src/detection/terminalshell/terminalshell_windows.c +++ b/src/detection/terminalshell/terminalshell_windows.c @@ -235,7 +235,7 @@ static bool detectDefaultTerminal(FFTerminalShellResult* result) { if(wcscmp(uuid, L"{00000000-0000-0000-0000-000000000000}") == 0) { - // Let Windows deside + // Let Windows decide return false; } if(wcscmp(uuid, L"{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}") == 0) diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index a9d3110be..8cd4aed65 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -55,7 +55,7 @@ static const char* detectVulkan(FFVulkanResult* result) FF_LIBRARY_LOAD_SYMBOL_MESSAGE2(vulkan, vkEnumeratePhysicalDevices, vkEnumeratePhysicalDevices@12) //Some drivers (nvdc) print messages to stdout - //and thats the best way i found to disable that + //and that is the best way I found to disable that FF_SUPPRESS_IO(); FFVersion instanceVersion = FF_VERSION_INIT; diff --git a/src/detection/wifi/wifi_apple.m b/src/detection/wifi/wifi_apple.m index 0281f4440..07d51599f 100644 --- a/src/detection/wifi/wifi_apple.m +++ b/src/detection/wifi/wifi_apple.m @@ -5,7 +5,7 @@ struct Apple80211; // https://code.google.com/archive/p/iphone-wireless/wikis/Apple80211.wiki -// 0 is sucessful; < 0 is failure +// 0 is successful; < 0 is failure int Apple80211Open(struct Apple80211 **handle) __attribute__((weak_import)); int Apple80211BindToInterface(struct Apple80211 *handle, CFStringRef interface) __attribute__((weak_import)); int Apple80211GetInfoCopy(struct Apple80211 *handle, CFDictionaryRef *info) __attribute__((weak_import)); diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c index 92eac7cfb..70b6d5d9c 100644 --- a/src/detection/wmtheme/wmtheme_linux.c +++ b/src/detection/wmtheme/wmtheme_linux.c @@ -194,7 +194,7 @@ bool ffDetectWmTheme(FFstrbuf* themeOrError) if(wm->wmPrettyName.length == 0) { - ffStrbufAppendS(themeOrError, "WM Theme needs sucessfull WM detection"); + ffStrbufAppendS(themeOrError, "WM Theme needs successful WM detection"); return false; }