frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "xfree86: common: unexport UnloadModule() and UnloadSubModule()" 

This reverts commit 00f69564c5.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2037>
This commit is contained in:
Alan Coopersmith 2025-06-23 17:35:44 -07:00 committed by Marge Bot
parent 1bec46dda1
commit 6a49a358e3
6 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/common/xf86Helper.c
View File

@ -61,7 +61,6 @@
#include "xf86InPriv.h" #include "xf86InPriv.h"
#include "xf86Config.h" #include "xf86Config.h"
#include "mivalidate.h" #include "mivalidate.h"
#include "xf86Module_priv.h"
/* For xf86GetClocks */ /* For xf86GetClocks */
#if defined(CSRG_BASED) || defined(__GNU__) #if defined(CSRG_BASED) || defined(__GNU__)

1
hw/xfree86/common/xf86Init.c
View File

@ -66,7 +66,6 @@
#include "systemd-logind.h" #include "systemd-logind.h"
#include "loaderProcs.h" #include "loaderProcs.h"
#include "xf86Module_priv.h"
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Config.h" #include "xf86Config.h"

2
hw/xfree86/common/xf86Module.h
View File

@ -151,6 +151,8 @@ typedef struct {
extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **, extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **,
const char **, void *, const char **, void *,
const XF86ModReqInfo *, int *, int *); const XF86ModReqInfo *, int *, int *);
extern _X_EXPORT void UnloadSubModule(void *);
extern _X_EXPORT void UnloadModule(void *);
extern _X_EXPORT void *LoaderSymbol(const char *); extern _X_EXPORT void *LoaderSymbol(const char *);
extern _X_EXPORT void *LoaderSymbolFromModule(void *, const char *); extern _X_EXPORT void *LoaderSymbolFromModule(void *, const char *);
extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int); extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);

22
hw/xfree86/common/xf86Module_priv.h
View File

@ -1,22 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XORG_XF86MODULE_PRIV_H
#define _XORG_XF86MODULE_PRIV_H
/*
* unload a previously loaded module
*
* @param mod the module to unload
*/
void UnloadModule(ModuleDescPtr mod);
/*
* unload a previously loaded sun-module
*
* @param mod the sub-module to unload
*/
void UnloadSubModule(ModuleDescPtr mod);
#endif /* _XORG_XF86MODULE_PRIV_H */

1
hw/xfree86/common/xf86Xinput.c
View File

@ -76,7 +76,6 @@
#include "eventstr.h" #include "eventstr.h"
#include "inpututils.h" #include "inpututils.h"
#include "optionstr.h" #include "optionstr.h"
#include "xf86Module_priv.h"
#ifdef HAVE_FNMATCH_H #ifdef HAVE_FNMATCH_H
#include <fnmatch.h> #include <fnmatch.h>

9
hw/xfree86/loader/loadmod.c
View File

@ -55,7 +55,6 @@
#include "loaderProcs.h" #include "loaderProcs.h"
#include "xf86Module.h" #include "xf86Module.h"
#include "loader.h" #include "loader.h"
#include "xf86Module_priv.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -841,8 +840,10 @@ LoadModule(const char *module, void *options, const XF86ModReqInfo *modreq,
} }
void void
UnloadModule(ModuleDescPtr mod) UnloadModule(void *_mod)
{ {
ModuleDescPtr mod = _mod;
if (mod == (ModuleDescPtr) 1) if (mod == (ModuleDescPtr) 1)
return; return;
@ -872,8 +873,10 @@ UnloadModule(ModuleDescPtr mod)
} }
void void
UnloadSubModule(ModuleDescPtr mod) UnloadSubModule(void *_mod)
{ {
ModuleDescPtr mod = (ModuleDescPtr) _mod;
/* Some drivers are calling us on built-in submodules, ignore them */ /* Some drivers are calling us on built-in submodules, ignore them */
if (mod == (ModuleDescPtr) 1) if (mod == (ModuleDescPtr) 1)
return; return;