kes Fix compile warning in src/lib/util.c

kes  Fix entry point for edit_job_codes() so that Win32 builds.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6136 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index e0b52f3aa207f22661f846f4d69e4730633916d3..b96bb3645337a893b639594d6404cb96e83a86f8 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -1899,7 +1899,7 @@ static void store_runscript(LEX *lc, RES_ITEM *item, int index, int pass)
 }
 
 /* callback function for edit_job_codes */
-char *job_code_callback_filesetname(JCR *jcr, const char* param)
+extern "C" char *job_code_callback_filesetname(JCR *jcr, const char* param)
 {
    if (param[0] == 'f') {
       return jcr->fileset->name();

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 161ba6ee243e9810804a4600c06bf85d32e3bdf8..e77832c2336f7e860b0fcf9636c53d91553565f4 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -301,7 +301,9 @@ bool             get_tls_enable          (TLS_CONTEXT *ctx);
 
 /* util.c */
 
+extern "C" {
 typedef char *(*job_code_callback_t)(JCR *, const char *);
+}
 
 bool             is_buf_zero             (char *buf, int len);
 void             lcase                   (char *str);

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 1a15ecf6f1e1a7cfbee53f4c37aa2b58bca413d4..d88714f43645a41e1e0c6d629fc2e093c6ec980e 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -496,7 +496,7 @@ void make_session_key(char *key, char *seed, int mode)
       char             *p;
 
       p = s;
-      sprintf(s + strlen(s), "%lu", (uint32_t)GetCurrentProcessId());
+      bsnprintf(s + strlen(s), ss, "%lu", (uint32_t)GetCurrentProcessId());
       (void)getcwd(s + strlen(s), 256);
       bsnprintf(s + strlen(s), ss, "%lu", (uint32_t)GetTickCount());
       QueryPerformanceCounter(&li);

diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def
index 264e7edcd17263e518ba65d99c03d6bc82cbc2fe..0a9786dfe2b28106a9562a765b052774d0ca5df2 100644 (file)
--- a/bacula/src/win32/dll/bacula.def
+++ b/bacula/src/win32/dll/bacula.def
@@ -682,7 +682,7 @@ _Z11encode_timelPc
 _Z11is_buf_zeroPci
 _Z13unbash_spacesPc
 _Z13unbash_spacesR8POOL_MEM
-_Z14edit_job_codesP3JCRPcS1_PKc
+_Z14edit_job_codesP3JCRPcS1_PKcPFS1_S0_S3_E
 _Z15job_type_to_stri
 _Z16job_level_to_stri
 _Z16make_session_keyPcS_i

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index fd47158c784e93d210427f26288ed2d28f07843d..4622e6839c6747811534193ce597bf6ef0340c3d 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,8 @@
 
 General:
 24Dec07
+kes  Fix compile warning in src/lib/util.c
+kes  Fix entry point for edit_job_codes() so that Win32 builds.
 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