Partial back out (disabled) %f job code editing because it

     does not build on Win32.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6130 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index aae20e5d917c32d81d186e5abb42b39b4d2699c8..03e129fbe376e7b10023e70b0a3b65c67446e424 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -1732,7 +1732,7 @@ static void store_short_runscript(LEX *lc, RES_ITEM *item, int index, int pass)
 
    if (pass == 2) {
       RUNSCRIPT *script = new_runscript();
-      script->set_job_code_callback(job_code_callback_filesetname);
+//    script->set_job_code_callback(job_code_callback_filesetname);
 
       script->set_command(lc->str);
 
@@ -1873,7 +1873,7 @@ static void store_runscript(LEX *lc, RES_ITEM *item, int index, int pass)
 
       RUNSCRIPT *script = new_runscript();
       memcpy(script, &res_runscript, sizeof(RUNSCRIPT));
-      script->set_job_code_callback(job_code_callback_filesetname);
+//    script->set_job_code_callback(job_code_callback_filesetname);
       
       if (*runscripts == NULL) {
         *runscripts = New(alist(10, not_owned_by_alist));

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index fbc365629bd2f5214dc2334bdebaed388f205a7b..8aac41a3b16ed8f74bc38c00d4a9d8ca881225ba 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -320,7 +320,8 @@ const char *     job_type_to_str         (int type);
 const char *     job_status_to_str       (int stat);
 const char *     job_level_to_str        (int level);
 void             make_session_key        (char *key, char *seed, int mode);
-POOLMEM *        edit_job_codes          (JCR *jcr, char *omsg, char *imsg, const char *to, job_code_callback_t job_code_callback = NULL);
+//POOLMEM *        edit_job_codes          (JCR *jcr, char *omsg, char *imsg, const char *to, job_code_callback_t job_code_callback = NULL);
+POOLMEM *        edit_job_codes          (JCR *jcr, char *omsg, char *imsg, const char *to);
 void             set_working_directory   (char *wd);
 const char *     last_path_separator     (const char *str);
 

diff --git a/bacula/src/lib/runscript.c b/bacula/src/lib/runscript.c
index 0b9db7848d524ca4782eff15a9ad8d304ecad134..ea7e71bd9fb5a582634cd23ae09da2df1ed0115c 100644 (file)
--- a/bacula/src/lib/runscript.c
+++ b/bacula/src/lib/runscript.c
@@ -208,7 +208,8 @@ bool RUNSCRIPT::run(JCR *jcr, const char *name)
    BPIPE *bpipe;
    char line[MAXSTRING];
 
-   ecmd = edit_job_codes(jcr, ecmd, this->command, "", this->job_code_callback);
+// ecmd = edit_job_codes(jcr, ecmd, this->command, "", this->job_code_callback);
+   ecmd = edit_job_codes(jcr, ecmd, this->command, "");
    Dmsg1(100, "runscript: running '%s'...\n", ecmd);
    Jmsg(jcr, M_INFO, 0, _("%s: run command \"%s\"\n"), name, ecmd);
 

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 54f96f16fd0e635b6fdc35a1f02b1d25569bc302..e05f55c86d0bc825382c11e1d956e0d055bdd429 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -574,7 +574,8 @@ void make_session_key(char *key, char *seed, int mode)
  *  to = recepients list
  *
  */
-POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to, job_code_callback_t callback)
+//POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to, job_code_callback_t callback)
+POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
 {
    char *p, *q;
    const char *str;
@@ -673,9 +674,9 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to, job_co
             break;
          default:
             str = NULL;
-            if (callback != NULL) {
-                str = callback(jcr, p);
-            }
+//          if (callback != NULL) {
+//              str = callback(jcr, p);
+//          }
 
             if (!str) {
                 add[0] = '%';

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 1e425949ffb587df45c32540c0c5c1176f830b0c..5c270425b5be2de3680056ef492c770660c5f60b 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,8 @@
 
 General:
 24Dec07
+kes  Partial back out (disabled) %f job code editing because it
+     does not build on Win32.
 kes  Fix seg fault Frank Sweetser reports in regression testing
      on his systems. The problem was that the original author of
      bsnprintf.c did not take into account the side effects of