gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
Signed-off-by: Madelyn Olson <madelyneolson@gmail.com>
This commit is contained in:
Madelyn Olson 2024-04-06 22:41:50 -07:00
parent c67f39142c
commit 52b39b894e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/module.c
View File

@ -12153,7 +12153,7 @@ int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loa
return C_ERR; return C_ERR;
} }
const char *onLoadNames[] = {"ValkeyModule_OnLoad", "ValkeyModule_OnLoad"}; const char *onLoadNames[] = {"ValkeyModule_OnLoad", "RedisModule_OnLoad"};
for (size_t i = 0; i < sizeof(onLoadNames) / sizeof(onLoadNames[0]); i++) { for (size_t i = 0; i < sizeof(onLoadNames) / sizeof(onLoadNames[0]); i++) {
onload = (int (*)(void *, void **, int))(unsigned long) dlsym(handle, onLoadNames[i]); onload = (int (*)(void *, void **, int))(unsigned long) dlsym(handle, onLoadNames[i]);
if (onload != NULL) { if (onload != NULL) {
@ -12167,7 +12167,7 @@ int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loa
if (onload == NULL) { if (onload == NULL) {
dlclose(handle); dlclose(handle);
serverLog(LL_WARNING, serverLog(LL_WARNING,
"Module %s does not export ValkeyModule_OnLoad() or ValkeyModule_OnLoad() " "Module %s does not export ValkeyModule_OnLoad() or RedisModule_OnLoad() "
"symbol. Module not loaded.",path); "symbol. Module not loaded.",path);
return C_ERR; return C_ERR;
} }
@ -12260,7 +12260,7 @@ int moduleUnload(sds name, const char **errmsg) {
} }
/* Give module a chance to clean up. */ /* Give module a chance to clean up. */
const char *onUnloadNames[] = {"ValkeyModule_OnUnload", "ValkeyModule_OnUnload"}; const char *onUnloadNames[] = {"ValkeyModule_OnUnload", "RedisModule_OnUnload"};
int (*onunload)(void *) = NULL; int (*onunload)(void *) = NULL;
for (size_t i = 0; i < sizeof(onUnloadNames) / sizeof(onUnloadNames[0]); i++) { for (size_t i = 0; i < sizeof(onUnloadNames) / sizeof(onUnloadNames[0]); i++) {
onunload = (int (*)(void *))(unsigned long)dlsym(module->handle, onUnloadNames[i]); onunload = (int (*)(void *))(unsigned long)dlsym(module->handle, onUnloadNames[i]);