Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ScreenSaverRunner: print errors to stderr instead of stdout. 

Also print on a couple of new error cases:
* print and error if fSaver is NULL,
* print and error if unload_add_on failed.
This commit is contained in:
John Scipione 2014-02-25 14:45:54 -05:00
parent 06f133c1f2
commit 94f8ac8cf1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/kits/screensaver/ScreenSaverRunner.cpp
View File

@ -131,20 +131,23 @@ ScreenSaverRunner::_LoadAddOn()
// instantiate_screen_saver()
if (get_image_symbol(fAddonImage, "instantiate_screen_saver",
B_SYMBOL_TYPE_TEXT, (void **)&instantiate) != B_OK) {
printf("Unable to find the instantiator\n");
fprintf(stderr, "Unable to find the instantiation function.\n");
} else {
BMessage state;
fSettings.GetModuleState(fSettings.ModuleName(), &state);
fSaver = instantiate(&state, fAddonImage);
}
if (fSaver->InitCheck() != B_OK) {
printf("ScreenSaver initialization failed: %s!\n",
if (fSaver == NULL) {
fprintf(stderr, "Screen saver initialization failed.\n");
_CleanUp();
} else if (fSaver->InitCheck() != B_OK) {
fprintf(stderr, "Screen saver initialization failed: %s.\n",
strerror(fSaver->InitCheck()));
_CleanUp();
}
} else
printf("Unable to open add-on %s.\n", path.Path());
fprintf(stderr, "Unable to open add-on %s.\n", path.Path());
Resume();
}
@ -157,7 +160,11 @@ ScreenSaverRunner::_CleanUp()
fSaver = NULL;
if (fAddonImage >= 0) {
unload_add_on(fAddonImage);
status_t result = unload_add_on(fAddonImage);
if (result != B_OK) {
fprintf(stderr, "Unable to unload screen saver add-on: %s.\n",
strerror(result));
}
fAddonImage = -1;
}
}