Make CONF::init header and .c file agree about types

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

diff --git a/bacula/src/count-lines b/bacula/src/count-lines
index 07ffb5d08c19417a70f3142627f257b656da9f4b..a680905b1b9272625be92c85f7464b869d843912 100755 (executable)
--- a/bacula/src/count-lines
+++ b/bacula/src/count-lines
@@ -1,18 +1,9 @@
 #!/bin/sh
 rm -f 1
 touch 1
-for i in . console gnome2-console cats dird filed tray-monitor \
-     qt-console \
-     win32 win32/compat findlib lib wx-console stored tools \
-     win32/wx-console win32/console win32/baculafd win32/filed \
-     win32/dird win32/libwin32 win32/stored win32/stored/baculasd \
-     tray-monitor qt-console qt-console/clients qt-console/console \
-     qt-console/fileset qt-console/help qt-console/jobgraphs \
-     qt-console/joblist qt-console/joblog qt-console/jobs qt-console/label \
-     qt-console/mediaedit qt-console/medialist qt-console/mount \
-     qt-console/relabel qt-console/restore qt-console/run qt-console/select \
-     qt-console/storage; do
+find . -type d >2
+for i in `cat 2` ; do
   ls -1 $i/*.c $i/*.cpp $i/*.h $i/*.in 2>/dev/null >>1
 done
 cat 1 | $HOME/bin/lines
-# rm -f 1
+# rm -f 1 2

diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index 8bf7b18a8f4e8bad20dd26523a8cdbc21b51ff0a..44ef2e0c3506963dc561e66939d3f03a93f57529 100644 (file)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -788,11 +788,11 @@ CONFIG *new_config_parser()
 void CONFIG::init(
    const char *cf,
    LEX_ERROR_HANDLER *scan_error,
-   int err_type,
+   int32_t err_type,
    void *vres_all,
-   int res_all_size,
-   int r_first,
-   int r_last,
+   int32_t res_all_size,
+   int32_t r_first,
+   int32_t r_last,
    RES_TABLE *resources,
    RES **res_head)
 {

diff --git a/bacula/technotes b/bacula/technotes
index c5be178e95a5734cdc39debc89809bbfbbcd3986..e25e9a4758e932bfab24f18661f9a8d685fce8a4 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,6 +3,8 @@
 General:
 
 15Jul09
+kes  Make CONF::init header and .c file agree about types.
+     Reported by "Eli Shemer" <elish@consist.co.il>
 kes  Fix Win64 build
 kes  Add more example SD Device configurations.
 ebl  Force the client_encoding to SQL_ASCII when database is already