From 34b273186a0c0886055d1824a81989ee016088a6 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Mon, 19 Sep 2022 18:00:19 +0200 Subject: [PATCH] FF_LIBRARY_LOAD: don't implicit create pointer --- src/common/library.h | 2 +- src/detection/displayserver/linux/wayland.c | 2 +- src/detection/displayserver/linux/xcb.c | 4 ++-- src/detection/displayserver/linux/xlib.c | 4 ++-- src/detection/gpu/gpu_linux.c | 2 +- src/detection/media/media_linux.c | 2 +- src/detection/terminalfont/terminalfont_apple.c | 2 +- src/detection/vulkan.c | 2 +- src/logo/image/im6.c | 2 +- src/logo/image/im7.c | 2 +- src/logo/image/image.c | 4 ++-- src/modules/opencl.c | 2 +- src/modules/opengl.c | 6 +++--- src/modules/packages.c | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/common/library.h b/src/common/library.h index d3e721ff8..25a323119 100644 --- a/src/common/library.h +++ b/src/common/library.h @@ -15,7 +15,7 @@ __typeof__(&symbolName) ff ## symbolName; #define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \ - void* libraryObjectName = ffLibraryLoad(&userLibraryName, __VA_ARGS__, NULL);\ + void* libraryObjectName = ffLibraryLoad(userLibraryName, __VA_ARGS__, NULL);\ if(libraryObjectName == NULL) \ return returnValue; diff --git a/src/detection/displayserver/linux/wayland.c b/src/detection/displayserver/linux/wayland.c index f69b869d7..2c9474c72 100644 --- a/src/detection/displayserver/linux/wayland.c +++ b/src/detection/displayserver/linux/wayland.c @@ -96,7 +96,7 @@ static void waylandGlobalAddListener(void* data, struct wl_registry* registry, u bool detectWayland(const FFinstance* instance, FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(wayland, instance->config.libWayland, false, "libwayland-client.so", 1) + FF_LIBRARY_LOAD(wayland, &instance->config.libWayland, false, "libwayland-client.so", 1) FF_LIBRARY_LOAD_SYMBOL(wayland, wl_display_connect, false) FF_LIBRARY_LOAD_SYMBOL(wayland, wl_display_get_fd, false) diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c index 205edd9b7..22d5fa87c 100644 --- a/src/detection/displayserver/linux/xcb.c +++ b/src/detection/displayserver/linux/xcb.c @@ -91,7 +91,7 @@ static void xcbDetectWMfromEWMH(XcbPropertyData* data, xcb_connection_t* connect void ffdsConnectXcb(const FFinstance* instance, FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(xcb, instance->config.libXcb, , "libxcb.so", 2) + FF_LIBRARY_LOAD(xcb, &instance->config.libXcb, , "libxcb.so", 2) FF_LIBRARY_LOAD_SYMBOL(xcb, xcb_connect,) FF_LIBRARY_LOAD_SYMBOL(xcb, xcb_get_setup,) FF_LIBRARY_LOAD_SYMBOL(xcb, xcb_setup_roots_iterator,) @@ -326,7 +326,7 @@ static void xcbRandrHandleScreen(XcbRandrData* data, xcb_screen_t* screen) void ffdsConnectXcbRandr(const FFinstance* instance, FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(xcbRandr, instance->config.libXcbRandr, , "libxcb-randr.so", 1) + FF_LIBRARY_LOAD(xcbRandr, &instance->config.libXcbRandr, , "libxcb-randr.so", 1) FF_LIBRARY_LOAD_SYMBOL(xcbRandr, xcb_connect,) FF_LIBRARY_LOAD_SYMBOL(xcbRandr, xcb_get_setup,) FF_LIBRARY_LOAD_SYMBOL(xcbRandr, xcb_setup_roots_iterator,) diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c index 19489f290..2cdc91d3c 100644 --- a/src/detection/displayserver/linux/xlib.c +++ b/src/detection/displayserver/linux/xlib.c @@ -55,7 +55,7 @@ static void x11DetectWMFromEWMH(X11PropertyData* data, Display* display, FFDispl void ffdsConnectXlib(const FFinstance* instance, FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(x11, instance->config.libX11, , "libX11.so", 7, "libX11-xcb.so", 2) + FF_LIBRARY_LOAD(x11, &instance->config.libX11, , "libX11.so", 7, "libX11-xcb.so", 2) FF_LIBRARY_LOAD_SYMBOL(x11, XOpenDisplay,) FF_LIBRARY_LOAD_SYMBOL(x11, XCloseDisplay,) @@ -259,7 +259,7 @@ static void xrandrHandleScreen(XrandrData* data, Screen* screen) void ffdsConnectXrandr(const FFinstance* instance, FFDisplayServerResult* result) { - FF_LIBRARY_LOAD(xrandr, instance->config.libXrandr, , "libXrandr.so", 3) + FF_LIBRARY_LOAD(xrandr, &instance->config.libXrandr, , "libXrandr.so", 3) FF_LIBRARY_LOAD_SYMBOL(xrandr, XOpenDisplay,) FF_LIBRARY_LOAD_SYMBOL(xrandr, XCloseDisplay,) diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c index 1dc3d2aa8..3559f311b 100644 --- a/src/detection/gpu/gpu_linux.c +++ b/src/detection/gpu/gpu_linux.c @@ -204,7 +204,7 @@ static const char* pciDetectGPUs(const FFinstance* instance, FFlist* gpus) { PCIData pci; - FF_LIBRARY_LOAD(libpci, instance->config.libPCI, "dlopen libpci.so failed", "libpci.so", 4) + FF_LIBRARY_LOAD(libpci, &instance->config.libPCI, "dlopen libpci.so failed", "libpci.so", 4) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libpci, pci_alloc) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libpci, pci_init) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libpci, pci_scan_bus) diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c index 726b81613..77ecbc3a9 100644 --- a/src/detection/media/media_linux.c +++ b/src/detection/media/media_linux.c @@ -295,7 +295,7 @@ static const char* getMedia(const FFinstance* instance, FFMediaResult* result) { DBusData data; - FF_LIBRARY_LOAD(dbus, instance->config.libDBus, "dlopen dbus failed", "libdbus-1.so", 4); + FF_LIBRARY_LOAD(dbus, &instance->config.libDBus, "dlopen dbus failed", "libdbus-1.so", 4); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(dbus, dbus_bus_get) FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(dbus, data, dbus_message_new_method_call) FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(dbus, data, dbus_message_iter_init) diff --git a/src/detection/terminalfont/terminalfont_apple.c b/src/detection/terminalfont/terminalfont_apple.c index cf63d3ac1..f14ae04c0 100644 --- a/src/detection/terminalfont/terminalfont_apple.c +++ b/src/detection/terminalfont/terminalfont_apple.c @@ -14,7 +14,7 @@ static const char* iterm2ParsePList(const FFinstance* instance, const FFstrbuf* content, const char* profile, FFTerminalFontResult* terminalFont) { - FF_LIBRARY_LOAD(libplist, instance->config.libplist, "dlopen libplist failed", "libplist-2.0"FF_LIBRARY_EXTENSION, 2); + FF_LIBRARY_LOAD(libplist, &instance->config.libplist, "dlopen libplist failed", "libplist-2.0"FF_LIBRARY_EXTENSION, 2); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libplist, plist_is_binary); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libplist, plist_from_bin); FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libplist, plist_from_xml); diff --git a/src/detection/vulkan.c b/src/detection/vulkan.c index 944a5c8ed..a04ab11d2 100644 --- a/src/detection/vulkan.c +++ b/src/detection/vulkan.c @@ -35,7 +35,7 @@ static void applyDriverName(VkPhysicalDeviceDriverProperties* properties, FFstrb static const char* detectVulkan(const FFinstance* instance, FFVulkanResult* result) { - FF_LIBRARY_LOAD(vulkan, instance->config.libVulkan, "dlopen libvulkan"FF_LIBRARY_EXTENSION " failed", "libvulkan"FF_LIBRARY_EXTENSION, 2) + FF_LIBRARY_LOAD(vulkan, &instance->config.libVulkan, "dlopen libvulkan"FF_LIBRARY_EXTENSION " failed", "libvulkan"FF_LIBRARY_EXTENSION, 2) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkGetInstanceProcAddr) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkCreateInstance) FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkDestroyInstance) diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c index 1325a1dcb..10e0e8b7d 100644 --- a/src/logo/image/im6.c +++ b/src/logo/image/im6.c @@ -14,7 +14,7 @@ static void* logoResize(const void* image, size_t width, size_t height, void* ex FFLogoImageResult ffLogoPrintImageIM6(FFinstance* instance, FFLogoRequestData* requestData) { - FF_LIBRARY_LOAD(imageMagick, instance->config.libImageMagick, FF_LOGO_IMAGE_RESULT_INIT_ERROR, "libMagickCore-6.Q16HDRI.so", 8, "libMagickCore-6.Q16.so", 8) + FF_LIBRARY_LOAD(imageMagick, &instance->config.libImageMagick, FF_LOGO_IMAGE_RESULT_INIT_ERROR, "libMagickCore-6.Q16HDRI.so", 8, "libMagickCore-6.Q16.so", 8) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR); FFIMData imData; diff --git a/src/logo/image/im7.c b/src/logo/image/im7.c index 6b7cce381..8cd87a216 100644 --- a/src/logo/image/im7.c +++ b/src/logo/image/im7.c @@ -14,7 +14,7 @@ static void* logoResize(const void* image, size_t width, size_t height, void* ex FFLogoImageResult ffLogoPrintImageIM7(FFinstance* instance, FFLogoRequestData* requestData) { - FF_LIBRARY_LOAD(imageMagick, instance->config.libImageMagick, FF_LOGO_IMAGE_RESULT_INIT_ERROR, "libMagickCore-7.Q16HDRI.so", 11, "libMagickCore-7.Q16.so", 11) + FF_LIBRARY_LOAD(imageMagick, &instance->config.libImageMagick, FF_LOGO_IMAGE_RESULT_INIT_ERROR, "libMagickCore-7.Q16HDRI.so", 11, "libMagickCore-7.Q16.so", 11) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR); FFIMData imData; diff --git a/src/logo/image/image.c b/src/logo/image/image.c index 384075a3e..d927735ad 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -25,7 +25,7 @@ static bool compressBlob(const FFinstance* instance, void** blob, size_t* length) { - FF_LIBRARY_LOAD(zlib, instance->config.libZ, false, "libz.so", 2) + FF_LIBRARY_LOAD(zlib, &instance->config.libZ, false, "libz.so", 2) FF_LIBRARY_LOAD_SYMBOL(zlib, compressBound, false) FF_LIBRARY_LOAD_SYMBOL(zlib, compress2, false) @@ -216,7 +216,7 @@ static bool printImageKitty(FFinstance* instance, FFLogoRequestData* requestData #include static bool printImageChafa(FFinstance* instance, FFLogoRequestData* requestData, const ImageData* imageData) { - FF_LIBRARY_LOAD(chafa, instance->config.libChafa, false, "libchafa.so", 1) + FF_LIBRARY_LOAD(chafa, &instance->config.libChafa, false, "libchafa.so", 1) FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_symbol_map_new, false) FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_symbol_map_add_by_tags, false) FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_canvas_config_new, false) diff --git a/src/modules/opencl.c b/src/modules/opencl.c index 6b9c0a643..dbe478e0d 100644 --- a/src/modules/opencl.c +++ b/src/modules/opencl.c @@ -83,7 +83,7 @@ static const char* printOpenCL(FFinstance* instance) { OpenCLData data; - FF_LIBRARY_LOAD(opencl, instance->config.libOpenCL, "dlopen libOpenCL.so failed", "libOpenCL.so", 1); + FF_LIBRARY_LOAD(opencl, &instance->config.libOpenCL, "dlopen libOpenCL.so failed", "libOpenCL.so", 1); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetPlatformIDs); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetDeviceIDs); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetDeviceInfo); diff --git a/src/modules/opengl.c b/src/modules/opengl.c index 9e263779e..8afff3583 100644 --- a/src/modules/opengl.c +++ b/src/modules/opengl.c @@ -148,7 +148,7 @@ static const char* eglPrint(FFinstance* instance) { EGLData eglData; - FF_LIBRARY_LOAD(egl, instance->config.libEGL, "dlopen egl failed", "libEGL.so", 1); + FF_LIBRARY_LOAD(egl, &instance->config.libEGL, "dlopen egl failed", "libEGL.so", 1); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(egl, eglData, eglGetProcAddress); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(egl, eglData, eglGetDisplay); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(egl, eglData, eglInitialize); @@ -263,7 +263,7 @@ static const char* glxPrint(FFinstance* instance) { GLXData data; - FF_LIBRARY_LOAD(glx, instance->config.libGLX, "dlopen glx failed", "libGLX.so", 1); + FF_LIBRARY_LOAD(glx, &instance->config.libGLX, "dlopen glx failed", "libGLX.so", 1); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(glx, data, glXGetProcAddress); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(glx, data, XOpenDisplay); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(glx, data, glXChooseVisual); @@ -328,7 +328,7 @@ static const char* osMesaPrint(FFinstance* instance) { OSMesaData data; - FF_LIBRARY_LOAD(osmesa, instance->config.libOSMesa, "dlopen osmesa failed", "libOSMesa.so", 8); + FF_LIBRARY_LOAD(osmesa, &instance->config.libOSMesa, "dlopen osmesa failed", "libOSMesa.so", 8); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(osmesa, data, OSMesaGetProcAddress); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(osmesa, data, OSMesaCreateContext); FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(osmesa, data, OSMesaMakeCurrent); diff --git a/src/modules/packages.c b/src/modules/packages.c index 82b991650..d3de44abc 100644 --- a/src/modules/packages.c +++ b/src/modules/packages.c @@ -269,7 +269,7 @@ static uint32_t getMacPortsPackages(FFstrbuf* baseDir) static uint32_t getRpmFromLibrpm(const FFinstance* instance) { - FF_LIBRARY_LOAD(rpm, instance->config.librpm, 0, "librpm.so", 12) + FF_LIBRARY_LOAD(rpm, &instance->config.librpm, 0, "librpm.so", 12) FF_LIBRARY_LOAD_SYMBOL(rpm, rpmReadConfigFiles, 0) FF_LIBRARY_LOAD_SYMBOL(rpm, rpmtsCreate, 0) FF_LIBRARY_LOAD_SYMBOL(rpm, rpmtsInitIterator, 0)