On 9/12/07, Dan Langille <[EMAIL PROTECTED]> wrote: > The quoting changes we have been talking about are ready to be > committed. I've run the regression tests many times over the past > week or so. > > Sometimes a tests will fail, but when rerunning the test manually, it > passes. I'll be committing this into trunk later today. If you > start seeing very funny stuff, please let me know. > > the main changes are to db_escape_string(): > > -void db_escape_string(char *snew, char *old, int len) > +void db_escape_string(JCR *jcr, B_DB *db, char *snew, char *old, int > len) > This change appears to have broken the win32 builds:
make make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/dll' make[1]: Nothing to be done for `all'. make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/dll' ===== Make of dll succeeded ===== make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/cats' Linking ../release/cats_mysql.dll libcats.exp:fake:(.edata+0x64): undefined reference to `db_escape_string(char*, char*, int)' collect2: ld returned 1 exit status make[1]: *** [../release/cats_mysql.dll] Error 1 make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/cats' !!!!! Make of cats failed !!!!! make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/filed' make[1]: Nothing to be done for `all'. make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/filed' ===== Make of filed succeeded ===== make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/dird' Linking ../release/bacula-dir.exe dird.o: In function `_Z10BaculaMainiPPc': /mnt/vg/projects/bacula/trunk/bacula/src/win32/dird/../../dird/dird.c:256: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' fd_cmds.o: In function `_Z33get_attributes_and_put_in_catalogP3JCR': /mnt/vg/projects/bacula/trunk/bacula/src/win32/dird/../../dird/fd_cmds.c:683: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' ua_query.o: In function `_Z18substitute_promptsP9UAContextPcPS1_i': /mnt/vg/projects/bacula/trunk/bacula/src/win32/dird/../../dird/ua_query.c:210: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' ua_restore.o: In function `_Z28insert_file_into_findex_listP9UAContextP11RESTORE_CTXPcS3_': /mnt/vg/projects/bacula/trunk/bacula/src/win32/dird/../../dird/ua_restore.c:971: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' /mnt/vg/projects/bacula/trunk/bacula/src/win32/dird/../../dird/ua_restore.c:980: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' ua_restore.o:/mnt/vg/projects/bacula/trunk/bacula/src/win32/dird/../../dird/ua_restore.c:584: more undefined references to `db_escape_string(JCR*, B_DB*, char*, char*, int)' follow collect2: ld returned 1 exit status make[1]: *** [../release/bacula-dir.exe] Error 1 make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/dird' !!!!! Make of dird failed !!!!! make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/stored' make[1]: Nothing to be done for `all'. make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/stored' ===== Make of stored succeeded ===== make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/console' make[1]: Nothing to be done for `all'. make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/console' ===== Make of console succeeded ===== make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/wx-console' make[1]: Nothing to be done for `all'. make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/wx-console' ===== Make of wx-console succeeded ===== make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/tools' Linking ../release/dbcheck.exe dbcheck.o: In function `_Z16repair_bad_pathsv': /mnt/vg/projects/bacula/trunk/bacula/src/win32/tools/../../tools/dbcheck.c:1165: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' dbcheck.o: In function `_Z20repair_bad_filenamesv': /mnt/vg/projects/bacula/trunk/bacula/src/win32/tools/../../tools/dbcheck.c:1106: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' dbcheck.o: In function `_Z29eliminate_duplicate_filenamesv': /mnt/vg/projects/bacula/trunk/bacula/src/win32/tools/../../tools/dbcheck.c:614: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' dbcheck.o: In function `_Z25eliminate_duplicate_pathsv': /mnt/vg/projects/bacula/trunk/bacula/src/win32/tools/../../tools/dbcheck.c:672: undefined reference to `db_escape_string(JCR*, B_DB*, char*, char*, int)' collect2: ld returned 1 exit status make[1]: *** [../release/dbcheck.exe] Error 1 make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/tools' !!!!! Make of tools failed !!!!! make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/scripts' make[1]: Nothing to be done for `all'. make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/scripts' ===== Make of scripts succeeded ===== make[1]: Entering directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/installer' make[1]: *** No rule to make target `../release/cats_mysql.dll', needed by `release/cats_mysql.dll'. Stop. make[1]: Leaving directory `/mnt/vg/projects/bacula/trunk/bacula/src/win32/installer' !!!!! Make of installer failed !!!!! John ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Bacula-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bacula-devel
