changeset 9971:d0680ace5fcb

oct-shlib.cc (octave_dlopen_shlib): reverse sense of test and improve error message
author John W. Eaton <jwe@octave.org>
date Fri, 11 Dec 2009 20:59:27 -0500
parents cc7ea6083774
children d32a6cc0193b
files liboctave/ChangeLog liboctave/oct-shlib.cc
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-11  John W. Eaton  <jwe@octave.org>
+
+	* oct-shlib.cc (octave_dlopen_shlib::octave_dlopen_shlib):
+	Print filename along with message from dlerror.
+	Reverse sense of test.
+
 2009-12-09  Jaroslav Hajek  <highegg@gmail.com>
 
 	* oct-shlib.h (octave_shlib): Rewrite.
--- a/liboctave/oct-shlib.cc
+++ b/liboctave/oct-shlib.cc
@@ -200,10 +200,12 @@
     {
       const char *msg = dlerror ();
 
-      if (! msg)
-        (*current_liboctave_error_handler) ("%s", msg);
+      if (msg)
+        (*current_liboctave_error_handler) ("%s: failed to load: %s",
+                                            file.c_str (), msg);
       else
-        (*current_liboctave_error_handler) ("%s: failed to load", file.c_str ());
+        (*current_liboctave_error_handler) ("%s: failed to load",
+                                            file.c_str ());
     }
 }