marcel/gamemode
1
0
Fork 0
mirror of https://github.com/FeralInteractive/gamemode.git synced 2025-06-06 07:37:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Actually don't error if a symbol is not required

Browse Source
This commit is contained in:
Marc Di Luzio 2019-02-08 17:13:48 +00:00
parent ca858d6932
commit 0f7950245a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/gamemode_client.h
View File

@ -101,10 +101,8 @@ static api_call_pid_return_int REAL_internal_gamemode_request_end_for = NULL;
* *
* Returns 0 on success and -1 on failure * Returns 0 on success and -1 on failure
*/ */
__attribute__((always_inline)) static inline int internal_bind_libgamemode_symbol(void *handle, __attribute__((always_inline)) static inline int internal_bind_libgamemode_symbol(
const char *name, void *handle, const char *name, void **out_func, size_t func_size, bool required)
void **out_func,
size_t func_size)
{ {
void *symbol_lookup = NULL; void *symbol_lookup = NULL;
char *dl_error = NULL; char *dl_error = NULL;
@ -112,7 +110,7 @@ __attribute__((always_inline)) static inline int internal_bind_libgamemode_symbo
/* Safely look up the symbol */ /* Safely look up the symbol */
symbol_lookup = dlsym(handle, name); symbol_lookup = dlsym(handle, name);
dl_error = dlerror(); dl_error = dlerror();
if (dl_error || !symbol_lookup) { if (required && (dl_error || !symbol_lookup)) {
snprintf(internal_gamemode_client_error_string, snprintf(internal_gamemode_client_error_string,
sizeof(internal_gamemode_client_error_string), sizeof(internal_gamemode_client_error_string),
"dlsym failed - %s", "dlsym failed - %s",
@ -196,8 +194,8 @@ __attribute__((always_inline)) static inline int internal_load_libgamemode(void)
if (internal_bind_libgamemode_symbol(libgamemode, if (internal_bind_libgamemode_symbol(libgamemode,
binder->name, binder->name,
binder->functor, binder->functor,
binder->func_size) != 0 && binder->func_size,
binder->required) { binder->required)) {
internal_libgamemode_loaded = -1; internal_libgamemode_loaded = -1;
return -1; return -1;
}; };