Pull compiler warning cleanup code + other from master

[bacula/bacula] / bacula / src / lib / plugins.c

diff --git a/bacula/src/lib/plugins.c b/bacula/src/lib/plugins.c
index 7b2fce78315ec16b4cc8cc4a1d8c8790dcd3f6b4..59aad3cdc9dcd5bdde99c6da97935490caee3ab3 100644 (file)
--- a/bacula/src/lib/plugins.c
+++ b/bacula/src/lib/plugins.c
@@ -1,5 +1,5 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
    Copyright (C) 2007-2011 Free Software Foundation Europe e.V.
 
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   Bacula(R) is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -101,6 +101,7 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir,
    int len, type_len;
 
 
+   Dmsg0(dbglvl, "load_plugins\n");
    name_max = pathconf(".", _PC_NAME_MAX);
    if (name_max < 1024) {
       name_max = 1024;
@@ -142,7 +143,7 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir,
          Dmsg3(dbglvl, "Rejected plugin: want=%s name=%s len=%d\n", type, result->d_name, len);
          continue;
       }
-      Dmsg2(dbglvl, "Loaded plugin: name=%s len=%d\n", result->d_name, len);
+      Dmsg2(dbglvl, "Found plugin: name=%s len=%d\n", result->d_name, len);
        
       pm_strcpy(fname, plugin_dir);
       if (need_slash) {
@@ -158,10 +159,11 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir,
       plugin->file_len = strstr(plugin->file, type) - plugin->file;
       plugin->pHandle = dlopen(fname.c_str(), RTLD_NOW);
       if (!plugin->pHandle) {
-         Jmsg(NULL, M_ERROR, 0, _("Plugin load %s failed: ERR=%s\n"), 
-              fname.c_str(), NPRT(dlerror()));
-         Dmsg2(dbglvl, "Plugin load %s failed: ERR=%s\n", fname.c_str(), 
-               NPRT(dlerror()));
+         char *error = dlerror();
+         Jmsg(NULL, M_ERROR, 0, _("dlopen plugin %s failed: ERR=%s\n"), 
+              fname.c_str(), NPRT(error));
+         Dmsg2(dbglvl, "dlopen plugin %s failed: ERR=%s\n", fname.c_str(), 
+               NPRT(error));
          close_plugin(plugin);
          continue;
       }