fun.epp (Firebird-3.0.2.32703-0.tar.bz2) | : | fun.epp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 107 | skipping to change at line 107 | |||
PathName libUtilPath; | PathName libUtilPath; | |||
}; | }; | |||
InitInstance<IbUtilStartup> ibUtilStartup; | InitInstance<IbUtilStartup> ibUtilStartup; | |||
bool tryLibrary(PathName libName, string& message) | bool tryLibrary(PathName libName, string& message) | |||
{ | { | |||
ModuleLoader::doctorModuleExtension(libName); | ModuleLoader::doctorModuleExtension(libName); | |||
ModuleLoader::Module* module = ModuleLoader::loadModule(libName); | ModuleLoader::Module* module = ModuleLoader::loadModule(NULL, lib Name); | |||
if (!module) | if (!module) | |||
{ | { | |||
message.printf("%s library has not been found", libName.c _str()); | message.printf("%s library has not been found", libName.c _str()); | |||
return false; | return false; | |||
} | } | |||
void (*ibUtilUnit)(void* (*)(long)); | void (*ibUtilUnit)(void* (*)(long)); | |||
if (!module->findSymbol("ib_util_init", ibUtilUnit)) | if (!module->findSymbol("ib_util_init", ibUtilUnit)) | |||
{ | { | |||
message.printf("ib_util_init not found in %s", libName.c_ str()); | message.printf("ib_util_init not found in %s", libName.c_ str()); | |||
skipping to change at line 764 | skipping to change at line 764 | |||
request->req_flags &= ~req_null; | request->req_flags &= ~req_null; | |||
} | } | |||
while (array_stack.hasData()) | while (array_stack.hasData()) | |||
{ | { | |||
delete[] array_stack.pop(); | delete[] array_stack.pop(); | |||
} | } | |||
blob_stack.close(); | blob_stack.close(); | |||
} // try | } // try | |||
catch (const status_exception& ex) | ||||
{ | ||||
while (array_stack.hasData()) | ||||
delete[] array_stack.pop(); | ||||
Arg::StatusVector v(ex); | ||||
string msg = "UDF: "; | ||||
msg += function->getName().toString(); | ||||
v << Arg::Gds(isc_random) << msg; | ||||
v.raise(); | ||||
} | ||||
catch (const Exception&) | catch (const Exception&) | |||
{ | { | |||
while (array_stack.hasData()) { | while (array_stack.hasData()) | |||
delete[] array_stack.pop(); | delete[] array_stack.pop(); | |||
} | ||||
throw; | throw; | |||
} | } | |||
if (null_flag) | if (null_flag) | |||
{ | { | |||
request->req_flags |= req_null; | request->req_flags |= req_null; | |||
} | } | |||
} | } | |||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 14 lines changed or added |