Index: src/OFPlugin.m ================================================================== --- src/OFPlugin.m +++ src/OFPlugin.m @@ -24,43 +24,36 @@ char *file; size_t pathlen, suffixlen; void *handle; OFPlugin *(*init_plugin)(); OFPlugin *plugin; - Class c; if ((self = [super init])) { pathlen = strlen(path); suffixlen = strlen(PLUGIN_SUFFIX); if ((file = malloc(pathlen + suffixlen + 1)) == NULL) { - c = [self class]; - [super free]; - @throw [OFNoMemException newWithClass: c + @throw [OFNoMemException newWithClass: self andSize: pathlen + suffixlen + 1]; } memcpy(file, path, pathlen); memcpy(file + pathlen, PLUGIN_SUFFIX, suffixlen); file[pathlen + suffixlen] = 0; if ((handle = dlopen(file, RTLD_NOW)) == NULL) { free(file); - c = [self class]; - [super free]; @throw [OFInitializationFailedException - newWithClass: c]; + newWithClass: self]; } free(file); if ((init_plugin = dlsym(handle, "init_plugin")) == NULL || (plugin = init_plugin()) == nil) { dlclose(handle); - c = [self class]; - [super free]; @throw [OFInitializationFailedException - newWithClass: c]; + newWithClass: self]; } plugin->handle = handle; return plugin; }