diff --git a/.clang-format b/.clang-format index c4ffa1ca5..3787e5eac 100644 --- a/.clang-format +++ b/.clang-format @@ -10,6 +10,7 @@ ColumnLimit: 0 ReflowComments: true BreakBeforeBraces: Attach +BreakBeforeCloseBracketBracedList: true BraceWrapping: AfterControlStatement: false AfterEnum: false diff --git a/src/common/impl/networking_linux.c b/src/common/impl/networking_linux.c index 4e7cd9e31..207d9562b 100644 --- a/src/common/impl/networking_linux.c +++ b/src/common/impl/networking_linux.c @@ -210,7 +210,8 @@ static const char* initNetworkingState(FFNetworkingState* state, const char* hos struct addrinfo hints = { .ai_family = state->ipv6 ? AF_INET6 : AF_INET, .ai_socktype = SOCK_STREAM, - .ai_flags = AI_NUMERICSERV}; + .ai_flags = AI_NUMERICSERV + }; FF_DEBUG("Resolving address: %s (%s)", host, state->ipv6 ? "IPv6" : "IPv4"); // Use AI_NUMERICSERV flag to indicate the service is a numeric port, reducing parsing time @@ -377,7 +378,8 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf { int pollRes = poll(&(struct pollfd) { .fd = state->sockfd, - .events = POLLIN}, + .events = POLLIN + }, 1, timeout > 0 ? (int) timeout : -1); if (pollRes == 0) { diff --git a/src/common/impl/networking_windows.c b/src/common/impl/networking_windows.c index ad7553ff0..6c7599515 100644 --- a/src/common/impl/networking_windows.c +++ b/src/common/impl/networking_windows.c @@ -142,7 +142,8 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho // Initialize overlapped structure with WSA event for asynchronous I/O state->overlapped = (OVERLAPPED) { - .hEvent = WSACreateEvent()}; + .hEvent = WSACreateEvent() + }; if (state->overlapped.hEvent == WSA_INVALID_EVENT) { FF_DEBUG("WSACreateEvent() failed"); diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c index ebb3aa2ae..925101907 100644 --- a/src/detection/bluetooth/bluetooth_windows.c +++ b/src/detection/bluetooth/bluetooth_windows.c @@ -14,12 +14,14 @@ const char* ffDetectBluetooth(FFBluetoothOptions* options, FFlist* devices /* FF FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindDeviceClose) BLUETOOTH_DEVICE_INFO btdi = { - .dwSize = sizeof(btdi)}; + .dwSize = sizeof(btdi) + }; HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstDevice(&(BLUETOOTH_DEVICE_SEARCH_PARAMS) { .fReturnConnected = TRUE, .fReturnRemembered = options->showDisconnected, .fReturnAuthenticated = options->showDisconnected, - .dwSize = sizeof(BLUETOOTH_DEVICE_SEARCH_PARAMS)}, + .dwSize = sizeof(BLUETOOTH_DEVICE_SEARCH_PARAMS) + }, &btdi); if (!hFind) { if (GetLastError() == ERROR_NO_MORE_ITEMS) { diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c index 4d407fa8d..8d709cb2e 100644 --- a/src/detection/bluetoothradio/bluetoothradio_windows.c +++ b/src/detection/bluetoothradio/bluetoothradio_windows.c @@ -60,7 +60,8 @@ const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */) HANDLE hRadio = NULL; HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstRadio(&(BLUETOOTH_FIND_RADIO_PARAMS) { - .dwSize = sizeof(BLUETOOTH_FIND_RADIO_PARAMS)}, + .dwSize = sizeof(BLUETOOTH_FIND_RADIO_PARAMS) + }, &hRadio); if (!hFind) { if (GetLastError() == ERROR_NO_MORE_ITEMS) { diff --git a/src/detection/bootmgr/bootmgr_windows.c b/src/detection/bootmgr/bootmgr_windows.c index 86206925f..fadf2c342 100644 --- a/src/detection/bootmgr/bootmgr_windows.c +++ b/src/detection/bootmgr/bootmgr_windows.c @@ -15,7 +15,8 @@ const char* enablePrivilege(const wchar_t* privilege) { TOKEN_PRIVILEGES tp = { .PrivilegeCount = 1, .Privileges = { - (LUID_AND_ATTRIBUTES) {.Attributes = SE_PRIVILEGE_ENABLED}}, + (LUID_AND_ATTRIBUTES) {.Attributes = SE_PRIVILEGE_ENABLED} + }, }; if (!LookupPrivilegeValueW(NULL, privilege, &tp.Privileges[0].Luid)) { return "LookupPrivilegeValue() failed"; diff --git a/src/detection/command/command.c b/src/detection/command/command.c index caec403ef..66ae36c36 100644 --- a/src/detection/command/command.c +++ b/src/detection/command/command.c @@ -21,7 +21,8 @@ static const char* spawnProcess(FFCommandOptions* options, FFProcessHandle* hand options->shell.chars, options->param.chars, options->text.chars, - NULL} + NULL + } : (char* const[]) {options->shell.chars, options->text.chars, NULL}, options->useStdErr, handle); diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c index 45f65c171..4518d3aad 100644 --- a/src/detection/cpu/cpu.c +++ b/src/detection/cpu/cpu.c @@ -9,7 +9,8 @@ const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu) { } const char* removeStrings[] = { - " CPU", " FPU", " APU", " Processor", " Dual-Core", " Quad-Core", " Six-Core", " Eight-Core", " Ten-Core", " 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core"}; + " CPU", " FPU", " APU", " Processor", " Dual-Core", " Quad-Core", " Six-Core", " Eight-Core", " Ten-Core", " 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core" + }; ffStrbufRemoveStrings(&cpu->name, ARRAY_SIZE(removeStrings), removeStrings); uint32_t radeonGraphics = ffStrbufFirstIndexS(&cpu->name, " w/ Radeon "); // w/ Radeon 780M Graphics if (radeonGraphics >= cpu->name.length) { diff --git a/src/detection/displayserver/displayserver_windows.c b/src/detection/displayserver/displayserver_windows.c index 98cf572fa..63a116024 100644 --- a/src/detection/displayserver/displayserver_windows.c +++ b/src/detection/displayserver/displayserver_windows.c @@ -106,7 +106,8 @@ static void detectDisplays(FFDisplayServerResult* ds) { .size = sizeof(preferredMode), .adapterId = path->targetInfo.adapterId, .id = path->targetInfo.id, - }}; + } + }; double preferredRefreshRate = 0; if (DisplayConfigGetDeviceInfo(&preferredMode.header) == ERROR_SUCCESS) { DISPLAYCONFIG_RATIONAL freq = preferredMode.targetMode.targetVideoSignalInfo.vSyncFreq; @@ -161,7 +162,8 @@ static void detectDisplays(FFDisplayServerResult* ds) { .size = sizeof(advColorInfo2), .adapterId = path->targetInfo.adapterId, .id = path->targetInfo.id, - }}; + } + }; if (DisplayConfigGetDeviceInfo(&advColorInfo2.header) == ERROR_SUCCESS) { if (advColorInfo2.highDynamicRangeUserEnabled) { display->hdrStatus = FF_DISPLAY_HDR_STATUS_ENABLED; @@ -178,7 +180,8 @@ static void detectDisplays(FFDisplayServerResult* ds) { .size = sizeof(advColorInfo), .adapterId = path->targetInfo.adapterId, .id = path->targetInfo.id, - }}; + } + }; if (DisplayConfigGetDeviceInfo(&advColorInfo.header) == ERROR_SUCCESS) { if (advColorInfo.advancedColorEnabled) { display->hdrStatus = FF_DISPLAY_HDR_STATUS_ENABLED; diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c index 80d8a02ff..ca553fddb 100644 --- a/src/detection/displayserver/linux/wayland/wayland.c +++ b/src/detection/displayserver/linux/wayland/wayland.c @@ -247,7 +247,8 @@ const char* ffdsConnectWayland(FFDisplayServerResult* result) { struct wl_registry_listener registry_listener = { .global = waylandGlobalAddListener, - .global_remove = (void*) stubListener}; + .global_remove = (void*) stubListener + }; data.ffwl_proxy_add_listener(registry, (void (**)(void)) ®istry_listener, &data); data.ffwl_display_roundtrip(data.display); diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c index 3627dd386..7fbbb204a 100644 --- a/src/detection/displayserver/linux/xcb.c +++ b/src/detection/displayserver/linux/xcb.c @@ -246,7 +246,8 @@ static bool xcbRandrHandleMonitor(XcbRandrData* data, xcb_randr_monitor_info_t* xcb_randr_output_iterator_t outputIterator = { .index = 0, .data = data->ffxcb_randr_monitor_info_outputs(monitor), - .rem = data->ffxcb_randr_monitor_info_outputs_length(monitor)}; + .rem = data->ffxcb_randr_monitor_info_outputs_length(monitor) + }; FF_AUTO_FREE xcb_get_atom_name_reply_t* nameReply = data->ffxcb_get_atom_name_reply( data->connection, diff --git a/src/detection/keyboard/keyboard_linux.c b/src/detection/keyboard/keyboard_linux.c index 47e8abeed..3d0630ca9 100644 --- a/src/detection/keyboard/keyboard_linux.c +++ b/src/detection/keyboard/keyboard_linux.c @@ -16,7 +16,8 @@ const char* ffDetectKeyboard(FFlist* devices /* List of FFKeyboardDevice */) { FFKeyboardDevice device = { .name = ffStrbufCreate(), - .serial = ffStrbufCreate()}; + .serial = ffStrbufCreate() + }; char* line = NULL; size_t len = 0; diff --git a/src/detection/netio/netio_haiku.cpp b/src/detection/netio/netio_haiku.cpp index f7105a1cf..352ec4440 100644 --- a/src/detection/netio/netio_haiku.cpp +++ b/src/detection/netio/netio_haiku.cpp @@ -44,7 +44,8 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) { .rxErrors = stats.receive.errors, .txErrors = stats.send.errors, .rxDrops = stats.receive.dropped, - .txDrops = stats.send.dropped}; + .txDrops = stats.send.dropped + }; } return NULL; diff --git a/src/detection/opengl/opengl_apple.c b/src/detection/opengl/opengl_apple.c index b12e02a26..91285938d 100644 --- a/src/detection/opengl/opengl_apple.c +++ b/src/detection/opengl/opengl_apple.c @@ -37,7 +37,8 @@ static const char* cglHandlePixelFormat(FFOpenGLResult* result, CGLPixelFormatOb const char* cglDetectOpenGL(FFOpenGLResult* result) { CGLPixelFormatObj pixelFormat; CGLPixelFormatAttribute attrs[] = { - kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core, kCGLPFAAccelerated, 0}; + kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core, kCGLPFAAccelerated, 0 + }; GLint num; if (CGLChoosePixelFormat(attrs, &pixelFormat, &num) != kCGLNoError) { diff --git a/src/detection/opengl/opengl_windows.c b/src/detection/opengl/opengl_windows.c index b8e0c41d1..01bd98690 100644 --- a/src/detection/opengl/opengl_windows.c +++ b/src/detection/opengl/opengl_windows.c @@ -41,7 +41,8 @@ static const char* wglHandlePixelFormat(WGLData* wglData, FFOpenGLResult* result .iPixelType = PFD_TYPE_RGBA, .cColorBits = 32, .cDepthBits = 24, - .iLayerType = PFD_MAIN_PLANE}; + .iLayerType = PFD_MAIN_PLANE + }; int pixelFormat = ChoosePixelFormat(hdc, &pfd); if (pixelFormat == 0) { ReleaseDC(hWnd, hdc); diff --git a/src/detection/packages/packages_nix.c b/src/detection/packages/packages_nix.c index b62dd67eb..bf6fa9e38 100644 --- a/src/detection/packages/packages_nix.c +++ b/src/detection/packages/packages_nix.c @@ -128,7 +128,8 @@ static uint32_t getNixPackagesImpl(char* path) { FFstrbuf line = { .allocated = 0, .length = lineLength, - .chars = output.chars + i - lineLength}; + .chars = output.chars + i - lineLength + }; if (isValidNixPkg(&line)) { count++; } diff --git a/src/detection/sound/audio_oss_sunos.h b/src/detection/sound/audio_oss_sunos.h index 3ee36da90..c5f47e9f1 100644 --- a/src/detection/sound/audio_oss_sunos.h +++ b/src/detection/sound/audio_oss_sunos.h @@ -668,11 +668,13 @@ typedef unsigned short oss_peaks_t[MAX_PEAK_CHANNELS]; * Again, DO NOT USE the following two macros. They are here for SOURCE * COMPATIBILITY ONLY. */ -#define SOUND_DEVICE_LABELS { \ - "Vol ", "Bass ", "Treble", "Synth", "Pcm ", "Speaker ", "Line ", "Mic ", "CD ", "Mix ", "Pcm2 ", "Rec ", "IGain", "OGain", "Aux1", "Aux2", "Aux3", "Digital1", "Digital2", "Digital3", "Phone", "Mono", "Video", "Radio", "Depth", "Rear", "Center", "Side"} +#define SOUND_DEVICE_LABELS { \ + "Vol ", "Bass ", "Treble", "Synth", "Pcm ", "Speaker ", "Line ", "Mic ", "CD ", "Mix ", "Pcm2 ", "Rec ", "IGain", "OGain", "Aux1", "Aux2", "Aux3", "Digital1", "Digital2", "Digital3", "Phone", "Mono", "Video", "Radio", "Depth", "Rear", "Center", "Side" \ +} -#define SOUND_DEVICE_NAMES { \ - "vol", "bass", "treble", "synth", "pcm", "speaker", "line", "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", "aux1", "aux2", "aux3", "dig1", "dig2", "dig3", "phone", "mono", "video", "radio", "depth", "rear", "center", "side"} +#define SOUND_DEVICE_NAMES { \ + "vol", "bass", "treble", "synth", "pcm", "speaker", "line", "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", "aux1", "aux2", "aux3", "dig1", "dig2", "dig3", "phone", "mono", "video", "radio", "depth", "rear", "center", "side" \ +} #define MIXER_READ(dev) __OSSIOR('M', dev, int) #define MIXER_WRITE(dev) __OSSIOWR('M', dev, int) diff --git a/src/detection/swap/swap_apple.c b/src/detection/swap/swap_apple.c index 1f87595d5..a4ebe8b4a 100644 --- a/src/detection/swap/swap_apple.c +++ b/src/detection/swap/swap_apple.c @@ -13,7 +13,7 @@ const char* ffDetectSwap(FFlist* result) { if (xsw.xsu_total == 0) { if (!__builtin_available(macOS 26.0, *)) { if (ffSysctlGetInt("vm.compressor_mode", 4) <= 2) { // No longer available in macOS 26.0 - return NULL; // Swap is disabled + return NULL; // Swap is disabled } } } diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index 24f6c5c91..b8bb066bf 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -99,12 +99,14 @@ static const char* detectVulkan(FFVulkanResult* result) { .engineVersion = projectVersion, // We need to request 1.1 to get physicalDeviceDriverProperties - .apiVersion = instanceVersion.minor >= 1 ? VK_API_VERSION_1_1 : VK_API_VERSION_1_0}, + .apiVersion = instanceVersion.minor >= 1 ? VK_API_VERSION_1_1 : VK_API_VERSION_1_0 + }, .enabledLayerCount = 0, .ppEnabledLayerNames = NULL, .enabledExtensionCount = 0, .ppEnabledExtensionNames = NULL, - .flags = 0}, + .flags = 0 + }, NULL, &vkInstance); if (res != VK_SUCCESS) { diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 7a53a49d1..23c612dd4 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -5383,7 +5383,8 @@ static const FFlogo X[] = { FF_COLOR_FG_BLACK, FF_COLOR_FG_BLUE, FF_COLOR_FG_YELLOW, - }}, + } + }, // Xenia { .names = {"Xenia"}, diff --git a/src/logo/logo.c b/src/logo/logo.c index 8a23f0070..1ca119bfa 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -564,7 +564,8 @@ static bool logoTryKnownType(void) { "/bin/sh", "-c", #endif options->source.chars, - NULL}); + NULL + }); if (error) { if (instance.config.display.showErrors) { diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index ea19ff176..ac1f3f9fc 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -273,4 +273,5 @@ FFModuleBaseInfo ffBatteryModuleInfo = { {"Battery time remaining minutes", "time-minutes"}, {"Battery time remaining seconds", "time-seconds"}, {"Battery time remaining (formatted)", "time-formatted"}, - }))}; + })) +}; diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index 5c7923ed4..36bcdeded 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -144,4 +144,5 @@ FFModuleBaseInfo ffBiosModuleInfo = { {"Bios vendor", "vendor"}, {"Bios version", "version"}, {"Firmware type", "type"}, - }))}; + })) +}; diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index 04e1f3628..745c5a038 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -174,4 +174,5 @@ FFModuleBaseInfo ffBluetoothModuleInfo = { {"Battery percentage number", "battery-percentage"}, {"Is connected", "connected"}, {"Battery percentage bar", "battery-percentage-bar"}, - }))}; + })) +}; diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c index 9ef4a6641..55a6e42de 100644 --- a/src/modules/bluetoothradio/bluetoothradio.c +++ b/src/modules/bluetoothradio/bluetoothradio.c @@ -205,4 +205,5 @@ FFModuleBaseInfo ffBluetoothRadioModuleInfo = { {"Vendor", "vendor"}, {"Discoverable", "discoverable"}, {"Connectable / Pairable", "connectable"}, - }))}; + })) +}; diff --git a/src/modules/board/board.c b/src/modules/board/board.c index 932dbc99c..0c0a3820b 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -121,4 +121,5 @@ FFModuleBaseInfo ffBoardModuleInfo = { {"Board vendor", "vendor"}, {"Board version", "version"}, {"Board serial number", "serial"}, - }))}; + })) +}; diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c index e42d642a9..403bbb0b5 100644 --- a/src/modules/bootmgr/bootmgr.c +++ b/src/modules/bootmgr/bootmgr.c @@ -117,4 +117,5 @@ FFModuleBaseInfo ffBootmgrModuleInfo = { {"Firmware file name", "firmware-name"}, {"Is secure boot enabled", "secure-boot"}, {"Boot order", "order"}, - }))}; + })) +}; diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 2f2c3b444..b434f9c32 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -198,4 +198,5 @@ FFModuleBaseInfo ffBrightnessModuleInfo = { {"Current brightness value", "current"}, {"Screen brightness (percentage bar)", "percentage-bar"}, {"Is built-in screen", "is-builtin"}, - }))}; + })) +}; diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c index 8e93ad0ce..8e13c900a 100644 --- a/src/modules/btrfs/btrfs.c +++ b/src/modules/btrfs/btrfs.c @@ -220,4 +220,5 @@ FFModuleBaseInfo ffBtrfsModuleInfo = { {"Allocated percentage bar", "allocated-percentage-bar"}, {"Node size", "node-size"}, {"Sector size", "sector-size"}, - }))}; + })) +}; diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c index 37c66b409..9fc0519c9 100644 --- a/src/modules/camera/camera.c +++ b/src/modules/camera/camera.c @@ -130,4 +130,5 @@ FFModuleBaseInfo ffCameraModuleInfo = { {"Identifier", "id"}, {"Width (in px)", "width"}, {"Height (in px)", "height"}, - }))}; + })) +}; diff --git a/src/modules/command/command.c b/src/modules/command/command.c index f26355d90..e53568b73 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -163,4 +163,5 @@ FFModuleBaseInfo ffCommandModuleInfo = { .generateJsonConfig = (void*) ffGenerateCommandJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Command result", "result"}, - }))}; + })) +}; diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 18cdf51de..734ed3ea7 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -256,4 +256,5 @@ FFModuleBaseInfo ffCPUModuleInfo = { {"Processor package count", "packages"}, {"CPU microarchitecture", "march"}, {"NUMA node count", "numa-nodes"}, - }))}; + })) +}; diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index f888362bf..7971b51eb 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -234,4 +234,5 @@ FFModuleBaseInfo ffCPUCacheModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Separate result", "result"}, {"Sum result", "sum"}, - }))}; + })) +}; diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 9eedeae8f..568cd0014 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -198,4 +198,5 @@ FFModuleBaseInfo ffCPUUsageModuleInfo = { {"CPU usage (percentage bar, average)", "avg-bar"}, {"CPU usage (percentage bar, maximum)", "max-bar"}, {"CPU usage (percentage bar, minimum)", "min-bar"}, - }))}; + })) +}; diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index ffdf78f6b..cf3bf299a 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -176,4 +176,5 @@ FFModuleBaseInfo ffDateTimeModuleInfo = { {"Offset from UTC in the ISO 8601 format", "offset-from-utc"}, {"Locale-dependent timezone name or abbreviation", "timezone-name"}, {"Day in month with leading zero", "day-pretty"}, - }))}; + })) +}; diff --git a/src/modules/de/de.c b/src/modules/de/de.c index a5eb40e9f..1000fb234 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -94,4 +94,5 @@ FFModuleBaseInfo ffDEModuleInfo = { {"DE process name", "process-name"}, {"DE pretty name", "pretty-name"}, {"DE version", "version"}, - }))}; + })) +}; diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 874abcd9b..c18fc5ca0 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -486,4 +486,5 @@ FFModuleBaseInfo ffDiskModuleInfo = { {"Years fraction after creation", "years-fraction"}, {"Size free", "size-free"}, {"Size available", "size-available"}, - }))}; + })) +}; diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index 1f6ee31e7..cbd49a9da 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -189,4 +189,5 @@ FFModuleBaseInfo ffDiskIOModuleInfo = { {"Size of data written [per second] (in bytes)", "bytes-written"}, {"Number of reads", "read-count"}, {"Number of writes", "write-count"}, - }))}; + })) +}; diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 91f4fbc80..ae94810da 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -453,4 +453,5 @@ FFModuleBaseInfo ffDisplayModuleInfo = { {"Screen preferred height (in pixels)", "preferred-height"}, {"Screen preferred refresh rate (in Hz)", "preferred-refresh-rate"}, {"DPI", "dpi"}, - }))}; + })) +}; diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c index bd698fdab..e11c7cab0 100644 --- a/src/modules/dns/dns.c +++ b/src/modules/dns/dns.c @@ -144,4 +144,5 @@ FFModuleBaseInfo ffDNSModuleInfo = { .generateJsonConfig = (void*) ffGenerateDNSJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"DNS result", "result"}, - }))}; + })) +}; diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c index 2ab41ef04..2eb7e34b5 100644 --- a/src/modules/editor/editor.c +++ b/src/modules/editor/editor.c @@ -117,4 +117,5 @@ FFModuleBaseInfo ffEditorModuleInfo = { {"Exe name of real path", "exe-name"}, {"Full path of real path", "path"}, {"Version", "version"}, - }))}; + })) +}; diff --git a/src/modules/font/font.c b/src/modules/font/font.c index b5873dd94..c49656c93 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -109,4 +109,5 @@ FFModuleBaseInfo ffFontModuleInfo = { {"Font 3", "font3"}, {"Font 4", "font4"}, {"Combined fonts for display", "combined"}, - }))}; + })) +}; diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index 8ee59bb95..abde2ad19 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -202,4 +202,5 @@ FFModuleBaseInfo ffGamepadModuleInfo = { {"Serial number", "serial"}, {"Battery percentage num", "battery-percentage"}, {"Battery percentage bar", "battery-percentage-bar"}, - }))}; + })) +}; diff --git a/src/modules/host/host.c b/src/modules/host/host.c index 96306e5c1..ec26e176b 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -152,4 +152,5 @@ FFModuleBaseInfo ffHostModuleInfo = { {"Product vendor", "vendor"}, {"Product serial number", "serial"}, {"Product uuid", "uuid"}, - }))}; + })) +}; diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index 314e68197..128bdd05c 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -64,7 +64,8 @@ bool ffGenerateIconsJsonResult(FF_MAYBE_UNUSED FFIconsOptions* options, yyjson_m bool success = false; FFIconsResult result = { .icons1 = ffStrbufCreate(), - .icons2 = ffStrbufCreate()}; + .icons2 = ffStrbufCreate() + }; const char* error = ffDetectIcons(&result); if (error) { @@ -104,4 +105,5 @@ FFModuleBaseInfo ffIconsModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Icons part 1", "icons1"}, {"Icons part 2", "icons2"}, - }))}; + })) +}; diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c index efa35bf22..77aff8dc7 100644 --- a/src/modules/initsystem/initsystem.c +++ b/src/modules/initsystem/initsystem.c @@ -116,4 +116,5 @@ FFModuleBaseInfo ffInitSystemModuleInfo = { {"Init system exe path", "exe"}, {"Init system version path", "version"}, {"Init system pid", "pid"}, - }))}; + })) +}; diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 93f828648..8e621c1e1 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -77,4 +77,5 @@ FFModuleBaseInfo ffKernelModuleInfo = { {"Architecture", "arch"}, {"Display version", "display-version"}, {"Page size", "page-size"}, - }))}; + })) +}; diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c index 1f94ad437..a6afbce71 100644 --- a/src/modules/keyboard/keyboard.c +++ b/src/modules/keyboard/keyboard.c @@ -160,4 +160,5 @@ FFModuleBaseInfo ffKeyboardModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Name", "name"}, {"Serial number", "serial"}, - }))}; + })) +}; diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index 89cc693a3..792b55d73 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -118,4 +118,5 @@ FFModuleBaseInfo ffLMModuleInfo = { {"LM service", "service"}, {"LM type", "type"}, {"LM version", "version"}, - }))}; + })) +}; diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index 1c14b03b2..5bba1c626 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -160,4 +160,5 @@ FFModuleBaseInfo ffLoadavgModuleInfo = { {"Load average over 1min", "loadavg1"}, {"Load average over 5min", "loadavg2"}, {"Load average over 15min", "loadavg3"}, - }))}; + })) +}; diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index c23ebb02d..c46701d48 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -77,4 +77,5 @@ FFModuleBaseInfo ffLocaleModuleInfo = { .generateJsonConfig = (void*) ffGenerateLocaleJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Locale code", "result"}, - }))}; + })) +}; diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 872b6c436..21b9ab2d4 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -439,4 +439,5 @@ FFModuleBaseInfo ffLocalIPModuleInfo = { {"MTU size in bytes", "mtu"}, {"Link speed (formatted)", "speed"}, {"Interface flags", "flags"}, - }))}; + })) +}; diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 5b9277c5b..9afba8041 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -195,4 +195,5 @@ FFModuleBaseInfo ffMediaModuleInfo = { {"Artist name", "artist"}, {"Album name", "album"}, {"Status", "status"}, - }))}; + })) +}; diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index 7aed68060..acfcb8130 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -131,4 +131,5 @@ FFModuleBaseInfo ffMemoryModuleInfo = { {"Total size", "total"}, {"Percentage used (num)", "percentage"}, {"Percentage used (bar)", "percentage-bar"}, - }))}; + })) +}; diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index 1e8f431e5..f1b6415a4 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -133,4 +133,5 @@ FFModuleBaseInfo ffMonitorModuleInfo = { {"Serial number", "serial"}, {"Maximum refresh rate in Hz", "refresh-rate"}, {"True if the display is HDR compatible", "hdr-compatible"}, - }))}; + })) +}; diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c index 9778d4e48..622e667cd 100644 --- a/src/modules/mouse/mouse.c +++ b/src/modules/mouse/mouse.c @@ -163,4 +163,5 @@ FFModuleBaseInfo ffMouseModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Mouse name", "name"}, {"Mouse serial number", "serial"}, - }))}; + })) +}; diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 33bcc7acf..b62f60f14 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -220,4 +220,5 @@ FFModuleBaseInfo ffNetIOModuleInfo = { {"Number of errors sent [per second]", "tx-errors"}, {"Number of packets dropped when receiving [per second]", "rx-drops"}, {"Number of packets dropped when sending [per second]", "tx-drops"}, - }))}; + })) +}; diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index 088c0dc83..1c00e2359 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -132,4 +132,5 @@ FFModuleBaseInfo ffOpenCLModuleInfo = { {"Platform version", "version"}, {"Platform name", "name"}, {"Platform vendor", "vendor"}, - }))}; + })) +}; diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 157d49d78..01da3df02 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -141,4 +141,5 @@ FFModuleBaseInfo ffOpenGLModuleInfo = { {"OpenGL vendor", "vendor"}, {"OpenGL shading language version", "slv"}, {"OpenGL library used", "library"}, - }))}; + })) +}; diff --git a/src/modules/os/os.c b/src/modules/os/os.c index e948eac18..bad5a7461 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -193,4 +193,5 @@ FFModuleBaseInfo ffOSModuleInfo = { {"Version codename of the OS", "codename"}, {"Build ID of the OS", "build-id"}, {"Architecture of the OS", "arch"}, - }))}; + })) +}; diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 8d414cb34..216f77ba5 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -520,4 +520,5 @@ FFModuleBaseInfo ffPackagesModuleInfo = { {"Total number of all brew packages", "brew-all"}, {"Total number of all guix packages", "guix-all"}, {"Total number of all hpkg packages", "hpkg-all"}, - }))}; + })) +}; diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index e5964ea68..f0fbe643d 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -249,4 +249,5 @@ FFModuleBaseInfo ffPhysicalDiskModuleInfo = { {"Device kind (Read-only or Read-write)", "readonly-type"}, {"Product revision", "revision"}, {"Device temperature (formatted)", "temperature"}, - }))}; + })) +}; diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c index 7d35ed659..e14d8fe5b 100644 --- a/src/modules/physicalmemory/physicalmemory.c +++ b/src/modules/physicalmemory/physicalmemory.c @@ -192,4 +192,5 @@ FFModuleBaseInfo ffPhysicalMemoryModuleInfo = { {"Part number", "part-number"}, {"True if ECC enabled", "is-ecc-enabled"}, {"True if a memory module is installed in the slot", "is-installed"}, - }))}; + })) +}; diff --git a/src/modules/player/player.c b/src/modules/player/player.c index f5d2083a2..52429d20e 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -122,4 +122,5 @@ FFModuleBaseInfo ffPlayerModuleInfo = { {"Player name", "name"}, {"Player Identifier", "id"}, {"URL name", "url"}, - }))}; + })) +}; diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index 997369b64..e7eb7515e 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -125,4 +125,5 @@ FFModuleBaseInfo ffPowerAdapterModuleInfo = { {"Power adapter model", "model"}, {"Power adapter description", "description"}, {"Power adapter serial number", "serial"}, - }))}; + })) +}; diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index fd1f96b4d..39a83052c 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -72,4 +72,6 @@ FFModuleBaseInfo ffProcessesModuleInfo = { .generateJsonResult = (void*) ffGenerateProcessesJsonResult, .generateJsonConfig = (void*) ffGenerateProcessesJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { - {"Process count", "result"}}))}; + {"Process count", "result"} + })) +}; diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 4f5e338bb..2f62716c3 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -121,4 +121,5 @@ FFModuleBaseInfo ffPublicIPModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Public IP address", "ip"}, {"Location", "location"}, - }))}; + })) +}; diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index c79d086ef..521a4cbcd 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -106,4 +106,5 @@ FFModuleBaseInfo ffShellModuleInfo = { {"Shell pretty name", "pretty-name"}, {"Shell full exe path", "exe-path"}, {"Shell tty used", "tty"}, - }))}; + })) +}; diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index 4f402058e..9225c149f 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -230,4 +230,5 @@ FFModuleBaseInfo ffSoundModuleInfo = { {"Identifier", "identifier"}, {"Volume (in percentage bar)", "volume-percentage-bar"}, {"Platform API used", "platform-api"}, - }))}; + })) +}; diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index ee58521ad..bf62ca451 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -196,4 +196,5 @@ FFModuleBaseInfo ffSwapModuleInfo = { {"Percentage used (num)", "percentage"}, {"Percentage used (bar)", "percentage-bar"}, {"Name", "name"}, - }))}; + })) +}; diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index 78c523ccb..4805cd648 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -100,4 +100,5 @@ FFModuleBaseInfo ffTerminalModuleInfo = { {"Terminal version", "version"}, {"Terminal full exe path", "exe-path"}, {"Terminal tty / pts used", "tty"}, - }))}; + })) +}; diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c index 1468b9bef..6df8321ab 100644 --- a/src/modules/terminaltheme/terminaltheme.c +++ b/src/modules/terminaltheme/terminaltheme.c @@ -106,4 +106,5 @@ FFModuleBaseInfo ffTerminalThemeModuleInfo = { {"Terminal foreground type (Dark / Light)", "fg-type"}, {"Terminal background color", "bg-color"}, {"Terminal background type (Dark / Light)", "bg-type"}, - }))}; + })) +}; diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index e119f9b5f..ec68e6694 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -7,7 +7,8 @@ bool ffPrintTheme(FFThemeOptions* options) { FFThemeResult result = { .theme1 = ffStrbufCreate(), - .theme2 = ffStrbufCreate()}; + .theme2 = ffStrbufCreate() + }; const char* error = ffDetectTheme(&result); if (error) { @@ -58,7 +59,8 @@ void ffGenerateThemeJsonConfig(FFThemeOptions* options, yyjson_mut_doc* doc, yyj bool ffGenerateThemeJsonResult(FF_MAYBE_UNUSED FFThemeOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) { FFThemeResult result = { .theme1 = ffStrbufCreate(), - .theme2 = ffStrbufCreate()}; + .theme2 = ffStrbufCreate() + }; const char* error = ffDetectTheme(&result); if (error) { @@ -96,4 +98,5 @@ FFModuleBaseInfo ffThemeModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Theme part 1", "theme1"}, {"Theme part 2", "theme2"}, - }))}; + })) +}; diff --git a/src/modules/title/title.c b/src/modules/title/title.c index df7a1a447..070d51704 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -197,4 +197,5 @@ FFModuleBaseInfo ffTitleModuleInfo = { {"UID (*nix) / SID (Windows)", "user-id"}, {"PID of current process", "pid"}, {"CWD with home dir replaced by `~`", "cwd"}, - }))}; + })) +}; diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c index e7fb17dbe..de74e6f4d 100644 --- a/src/modules/tpm/tpm.c +++ b/src/modules/tpm/tpm.c @@ -7,7 +7,8 @@ bool ffPrintTPM(FFTPMOptions* options) { FFTPMResult result = { .version = ffStrbufCreate(), - .description = ffStrbufCreate()}; + .description = ffStrbufCreate() + }; const char* error = ffDetectTPM(&result); if (error) { @@ -54,7 +55,8 @@ void ffGenerateTPMJsonConfig(FFTPMOptions* options, yyjson_mut_doc* doc, yyjson_ bool ffGenerateTPMJsonResult(FF_MAYBE_UNUSED FFTPMOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) { FFTPMResult result = { .version = ffStrbufCreate(), - .description = ffStrbufCreate()}; + .description = ffStrbufCreate() + }; const char* error = ffDetectTPM(&result); if (error) { @@ -92,4 +94,5 @@ FFModuleBaseInfo ffTPMModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"TPM device version", "version"}, {"TPM general description", "description"}, - }))}; + })) +}; diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index 6d3cf439a..a00134d21 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -102,4 +102,5 @@ FFModuleBaseInfo ffUptimeModuleInfo = { {"Days of year after boot", "days-of-year"}, {"Years fraction after boot", "years-fraction"}, {"Formatted uptime", "formatted"}, - }))}; + })) +}; diff --git a/src/modules/users/users.c b/src/modules/users/users.c index 51a471085..47e6e946d 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -202,4 +202,5 @@ FFModuleBaseInfo ffUsersModuleInfo = { {"Years integer after login", "years"}, {"Days of year after login", "days-of-year"}, {"Years fraction after login", "years-fraction"}, - }))}; + })) +}; diff --git a/src/modules/version/version.c b/src/modules/version/version.c index 0749f05b2..c47ca04c1 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -113,4 +113,5 @@ FFModuleBaseInfo ffVersionModuleInfo = { {"Date time when compiling", "compile-time"}, {"Compiler used when compiling", "compiler"}, {"Libc used when compiling", "libc"}, - }))}; + })) +}; diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index b1125a2c0..985687b99 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -145,4 +145,5 @@ FFModuleBaseInfo ffVulkanModuleInfo = { {"API version", "api-version"}, {"Conformance version", "conformance-version"}, {"Instance version", "instance-version"}, - }))}; + })) +}; diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index f0795d06b..1f8498faa 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -86,4 +86,5 @@ FFModuleBaseInfo ffWallpaperModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"File name", "file-name"}, {"Full path", "full-path"}, - }))}; + })) +}; diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index 8a1d7a22f..f83b9a923 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -101,4 +101,5 @@ FFModuleBaseInfo ffWeatherModuleInfo = { .generateJsonConfig = (void*) ffGenerateWeatherJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"Weather result", "result"}, - }))}; + })) +}; diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 7713a0481..58b306ad0 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -236,4 +236,5 @@ FFModuleBaseInfo ffWifiModuleInfo = { {"Connection signal quality (percentage bar)", "signal-quality-bar"}, {"Connection channel number", "channel"}, {"Connection channel band in GHz", "band"}, - }))}; + })) +}; diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index 526de6fc7..55696bb67 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -134,4 +134,5 @@ FFModuleBaseInfo ffWMModuleInfo = { {"WM protocol name", "protocol-name"}, {"WM plugin name", "plugin-name"}, {"WM version", "version"}, - }))}; + })) +}; diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index 36cea8cb2..76b0ba091 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -71,4 +71,5 @@ FFModuleBaseInfo ffWMThemeModuleInfo = { .generateJsonConfig = (void*) ffGenerateWMThemeJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { {"WM theme", "result"}, - }))}; + })) +}; diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index b82963310..96585df30 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -214,4 +214,5 @@ FFModuleBaseInfo ffZpoolModuleInfo = { {"Size allocated percentage bar", "allocated-percentage-bar"}, {"Fragmentation percentage bar", "fragmentation-percentage-bar"}, {"Is read-only", "is-readonly"}, - }))}; + })) +}; diff --git a/tests/format.c b/tests/format.c index 984666dc3..6e9b32f0e 100644 --- a/tests/format.c +++ b/tests/format.c @@ -7,7 +7,7 @@ static void verify(const char* format, const char* arg, const char* expected, int lineNo) { FF_STRBUF_AUTO_DESTROY result = ffStrbufCreate(); FF_STRBUF_AUTO_DESTROY formatter = ffStrbufCreateStatic(format); - const FFformatarg arguments[] = { {.type = FF_ARG_TYPE_STRING, arg}}; + const FFformatarg arguments[] = {{.type = FF_ARG_TYPE_STRING, arg}}; ffParseFormatString(&result, &formatter, 1, arguments); if (!ffStrbufEqualS(&result, expected)) { fprintf(stderr, FASTFETCH_TEXT_MODIFIER_ERROR "[%d] %s: expected \"%s\", got \"%s\"\n" FASTFETCH_TEXT_MODIFIER_RESET, lineNo, format, expected, result.chars);