From 9bbe63b11e8d1311df0e6376948bd883f9a60327 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Tue, 7 Nov 2006 15:18:42 +0000
Subject: [PATCH] Merged r2903:2904 from SDL-1.2 branch to trunk: BeOS loadso
 updates.

---
 src/loadso/beos/SDL_sysloadso.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/loadso/beos/SDL_sysloadso.c b/src/loadso/beos/SDL_sysloadso.c
index 7e4be9376..ba06d933e 100644
--- a/src/loadso/beos/SDL_sysloadso.c
+++ b/src/loadso/beos/SDL_sysloadso.c
@@ -35,35 +35,25 @@ void *
 SDL_LoadObject(const char *sofile)
 {
     void *handle = NULL;
-    const char *loaderror = "Unknown error";
     image_id library_id = load_add_on(sofile);
-    if (library_id == B_ERROR) {
-        loaderror = "BeOS error";
+    if (library_id < 0) {
+        SDL_SetError(strerror((int) library_id));
     } else {
         handle = (void *) (library_id);
     }
-
-    if (handle == NULL) {
-        SDL_SetError("Failed loading %s: %s", sofile, loaderror);
-    }
     return (handle);
 }
 
 void *
 SDL_LoadFunction(void *handle, const char *name)
 {
-    void *symbol = NULL;
-    const char *loaderror = "Unknown error";
+    void *sym = NULL;
     image_id library_id = (image_id) handle;
-    if (get_image_symbol(library_id,
-                         name, B_SYMBOL_TYPE_TEXT, &symbol) != B_NO_ERROR) {
-        loaderror = "Symbol not found";
-    }
-
-    if (symbol == NULL) {
-        SDL_SetError("Failed loading %s: %s", name, loaderror);
+    status_t rc = get_image_symbol(library_id, name, B_SYMBOL_TYPE_TEXT, &sym);
+    if (rc != B_NO_ERROR) {
+        SDL_SetError(strerror(rc));
     }
-    return (symbol);
+    return (sym);
 }
 
 void
@@ -77,4 +67,6 @@ SDL_UnloadObject(void *handle)
 }
 
 #endif /* SDL_LOADSO_BEOS */
+
 /* vi: set ts=4 sw=4 expandtab: */
+