pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BeOS loadso code now reports failure correctly from SDL_LoadObject(), and uses

Browse source 
the system to provide text for SDL_SetError().

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402226
This commit is contained in:
Ryan C. Gordon 2006-11-07 15:17:31 +00:00
parent c3143b8b9c
commit 72c5d1e8ab
1 changed files with 29 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/loadso/beos/SDL_sysloadso.c
View file

@ -31,40 +31,33 @@
#include "SDL_loadso.h" #include "SDL_loadso.h"
void *SDL_LoadObject(const char *sofile) void *
SDL_LoadObject(const char *sofile)
{ {
void *handle = NULL; void *handle = NULL;
const char *loaderror = "Unknown error";
image_id library_id = load_add_on(sofile); image_id library_id = load_add_on(sofile);
if ( library_id == B_ERROR ) { if (library_id < 0) {
loaderror = "BeOS error"; SDL_SetError(strerror((int) library_id));
} else { } else {
handle = (void *) (library_id); handle = (void *) (library_id);
} }
if ( handle == NULL ) {
SDL_SetError("Failed loading %s: %s", sofile, loaderror);
}
return (handle); return (handle);
} }
void *SDL_LoadFunction(void *handle, const char *name) void *
SDL_LoadFunction(void *handle, const char *name)
{ {
void *symbol = NULL; void *sym = NULL;
const char *loaderror = "Unknown error";
image_id library_id = (image_id) handle; image_id library_id = (image_id) handle;
if ( get_image_symbol(library_id, status_t rc = get_image_symbol(library_id, name, B_SYMBOL_TYPE_TEXT, &sym);
name, B_SYMBOL_TYPE_TEXT, &symbol) != B_NO_ERROR ) { if (rc != B_NO_ERROR) {
loaderror = "Symbol not found"; SDL_SetError(strerror(rc));
}
return (sym);
} }
if ( symbol == NULL ) { void
SDL_SetError("Failed loading %s: %s", name, loaderror); SDL_UnloadObject(void *handle)
}
return(symbol);
}
void SDL_UnloadObject(void *handle)
{ {
image_id library_id; image_id library_id;
if (handle != NULL) { if (handle != NULL) {
@ -74,3 +67,6 @@ void SDL_UnloadObject(void *handle)
} }
#endif /* SDL_LOADSO_BEOS */ #endif /* SDL_LOADSO_BEOS */
/* vi: set ts=4 sw=4 expandtab: */