Add %D option to edit_job_code, simplify callbacks on director side

[bacula/bacula] / bacula / src / stored / sd_plugins.c

diff --git a/bacula/src/stored/sd_plugins.c b/bacula/src/stored/sd_plugins.c
index 7bbc7f549ae1c3f02ef4d745d427b0682f62e9a9..e77c300f851db42acf9f3c42e76020c8451f6ca4 100644 (file)
--- a/bacula/src/stored/sd_plugins.c
+++ b/bacula/src/stored/sd_plugins.c
@@ -75,7 +75,7 @@ void generate_plugin_event(JCR *jcr, bEventType eventType, void *value)
    Plugin *plugin;
    int i = 0;
 
-   if (!plugin_list) {
+   if (!bplugin_list) {
       return;
    }
 
@@ -84,7 +84,7 @@ void generate_plugin_event(JCR *jcr, bEventType eventType, void *value)
 
    Dmsg2(dbglvl, "plugin_ctx_list=%p JobId=%d\n", jcr->plugin_ctx_list, jcr->JobId);
 
-   foreach_alist(plugin, plugin_list) {
+   foreach_alist(plugin, bplugin_list) {
       bRC rc;
       rc = plug_func(plugin)->handlePluginEvent(&plugin_ctx_list[i++], &event, value);
       if (rc != bRC_OK) {
@@ -116,7 +116,7 @@ void load_sd_plugins(const char *plugin_dir)
       return;
    }
 
-   plugin_list = New(alist(10, not_owned_by_alist));
+   bplugin_list = New(alist(10, not_owned_by_alist));
    load_plugins((void *)&binfo, (void *)&bfuncs, plugin_dir, plugin_type, NULL);
    dbg_plugin_add_hook(dump_sd_plugin);
 }
@@ -129,11 +129,11 @@ void new_plugins(JCR *jcr)
    Plugin *plugin;
    int i = 0;
 
-   if (!plugin_list) {
+   if (!bplugin_list) {
       return;
    }
 
-   int num = plugin_list->size();
+   int num = bplugin_list->size();
 
    if (num == 0) {
       return;
@@ -143,7 +143,7 @@ void new_plugins(JCR *jcr)
 
    bpContext *plugin_ctx_list = jcr->plugin_ctx_list;
    Dmsg2(dbglvl, "Instantiate plugin_ctx_list=%p JobId=%d\n", jcr->plugin_ctx_list, jcr->JobId);
-   foreach_alist(plugin, plugin_list) {
+   foreach_alist(plugin, bplugin_list) {
       /* Start a new instance of each plugin */
       plugin_ctx_list[i].bContext = (void *)jcr;
       plugin_ctx_list[i].pContext = NULL;
@@ -159,13 +159,13 @@ void free_plugins(JCR *jcr)
    Plugin *plugin;
    int i = 0;
 
-   if (!plugin_list) {
+   if (!bplugin_list) {
       return;
    }
 
    bpContext *plugin_ctx_list = (bpContext *)jcr->plugin_ctx_list;
    Dmsg2(dbglvl, "Free instance plugin_ctx_list=%p JobId=%d\n", jcr->plugin_ctx_list, jcr->JobId);
-   foreach_alist(plugin, plugin_list) {
+   foreach_alist(plugin, bplugin_list) {
       /* Free the plugin instance */
       plug_func(plugin)->freePlugin(&plugin_ctx_list[i++]);
    }