break;
}
if( mod ) {
- Log_Warning("Module", "Circular dependency detected");
+ Log_Warning("Module", "Circular dependency detected (%s and %s)",
+ mod->Name, Module->Name);
LEAVE_RET('i', -1);
}
break;
}
if( i == giNumBuiltinModules ) {
- Log_Warning("Module", "Dependency '%s' for module '%s' failed");
+ Log_Warning("Module", "Dependency '%s' for module '%s' failed",
+ deps[j], Module->Name);
return -1;
}
if(args) free(args);
+ // Remove from loading list
+ gLoadingModules = gLoadingModules->Next;
+
if( ret != MODULE_ERR_OK ) {
switch(ret)
{
}
LOG("ret = %i", ret);
- // Remove from loading list
- gLoadingModules = gLoadingModules->Next;
-
// Add to loaded list
LOCK( &glModuleSpinlock );
Module->Next = gLoadedModules;