From: Robert Nelson Date: Fri, 8 Dec 2006 06:49:38 +0000 (+0000) Subject: Rename cats_pgsql to cats_postgresql and cats_sqlite to cats_sqlite3. This makes... X-Git-Tag: Release-2.0.0~145 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=532ac75119af90ec8080b1ffbd56ab4141af87ef;p=bacula%2Fbacula Rename cats_pgsql to cats_postgresql and cats_sqlite to cats_sqlite3. This makes manual installation in the regression scripts easier. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3772 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 0dbdde72e5..57b35067f9 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -146,7 +146,7 @@ sysconfdir=`eval echo ${sysconfdir}` datadir=`eval echo ${datadir}` localedir=`eval echo ${datadir}/locale` AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir") -AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir") +AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir") # ------------------------------------------------------------------------- # If the user has not set --exec-prefix, we default to ${prefix} diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c index 0e817fdc99..946cdb39f2 100644 --- a/bacula/src/cats/mysql.c +++ b/bacula/src/cats/mysql.c @@ -348,7 +348,7 @@ int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler } if (result_handler != NULL) { if ((mdb->result = sql_use_result(mdb)) != NULL) { - int num_fields = 0; + int num_fields = 0; /* We *must* fetch all rows */ while ((row = sql_fetch_row(mdb)) != NULL) { diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index aa69ec1270..f7a09ffb68 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -820,7 +820,7 @@ int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest, Dmsg1(20, "Encrypt len=%d\n", cipher_input_len); if (!crypto_cipher_update(cipher_ctx, packet_len, sizeof(packet_len), - (u_int8_t *)jcr->crypto_buf, &initial_len)) { + (u_int8_t *)jcr->crypto_buf, &initial_len)) { /* Encryption failed. Shouldn't happen. */ Jmsg(jcr, M_FATAL, 0, _("Encryption error\n")); goto err; diff --git a/bacula/src/win32/bacula.sln b/bacula/src/win32/bacula.sln index 76f58fa161..a625e9a30b 100644 --- a/bacula/src/win32/bacula.sln +++ b/bacula/src/win32/bacula.sln @@ -144,7 +144,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbcheck", "tools\dbcheck\db {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} = {8B79A2B5-8889-43D4-9B92-9AE8A6F00413} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_pgsql", "cats\cats_pgsql\cats_pgsql.vcproj", "{2FB961E5-213C-4475-8CB3-72F904D40752}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_postgresql", "cats\cats_postgresql\cats_postgresql.vcproj", "{2FB961E5-213C-4475-8CB3-72F904D40752}" ProjectSection(ProjectDependencies) = postProject {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220} EndProjectSection @@ -194,7 +194,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{40CA scripts\mtx-changer.cmd = scripts\mtx-changer.cmd EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_sqlite", "cats\cats_sqlite\cats_sqlite.vcproj", "{23BFE838-5682-4F39-969F-0B40366D4D98}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cats_sqlite3", "cats\cats_sqlite3\cats_sqlite3.vcproj", "{23BFE838-5682-4F39-969F-0B40366D4D98}" ProjectSection(ProjectDependencies) = postProject {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220} EndProjectSection diff --git a/bacula/src/win32/cats/Makefile b/bacula/src/win32/cats/Makefile index fa76b9100b..0c2caeab18 100644 --- a/bacula/src/win32/cats/Makefile +++ b/bacula/src/win32/cats/Makefile @@ -43,16 +43,16 @@ LIBS_DLL = \ .PHONY: all clean -all: $(LIBDIR)/libcats.a $(BINDIR)/cats_mysql.dll $(BINDIR)/cats_pgsql.dll $(BINDIR)/cats_sqlite.dll +all: $(LIBDIR)/libcats.a $(BINDIR)/cats_mysql.dll $(BINDIR)/cats_postgresql.dll $(BINDIR)/cats_sqlite3.dll clean: @echo "Cleaning `pwd`" $(call clean_obj,$(addprefix $(OBJDIR)/cats_mysql/,mysql.o $(SQL_OBJS))) - $(call clean_obj,$(addprefix $(OBJDIR)/cats_pgsql/,postgresql.o $(SQL_OBJS))) - $(call clean_obj,$(addprefix $(OBJDIR)/cats_sqlite/,sqlite.o $(SQL_OBJS))) + $(call clean_obj,$(addprefix $(OBJDIR)/cats_postgresql/,postgresql.o $(SQL_OBJS))) + $(call clean_obj,$(addprefix $(OBJDIR)/cats_sqlite3/,sqlite.o $(SQL_OBJS))) $(call clean_exe,$(BINDIR)/cats_mysql.dll) - $(call clean_exe,$(BINDIR)/cats_pgsql.dll) - $(call clean_exe,$(BINDIR)/cats_sqlite.dll) + $(call clean_exe,$(BINDIR)/cats_postgresql.dll) + $(call clean_exe,$(BINDIR)/cats_sqlite3.dll) $(ECHO_CMD)rm -f $(OBJDIR)/libcats.exp $(LIBDIR)/libcats.a $(LIBDIR)/libcats.a $(OBJDIR)/libcats.exp: bacula_cats.def @@ -63,12 +63,12 @@ $(BINDIR)/cats_mysql.dll: $(addprefix $(OBJDIR)/cats_mysql/,mysql.o $(SQL_OBJS)) $(call checkdir,$@) $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows $^ $(LIBS_MYSQL) $(LIBS_DLL) -o $@ -$(BINDIR)/cats_pgsql.dll: $(addprefix $(OBJDIR)/cats_pgsql/,postgresql.o $(SQL_OBJS)) $(OBJDIR)/libcats.exp +$(BINDIR)/cats_postgresql.dll: $(addprefix $(OBJDIR)/cats_postgresql/,postgresql.o $(SQL_OBJS)) $(OBJDIR)/libcats.exp @echo "Linking $@" $(call checkdir,$@) $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows $^ $(LIBS_POSTGRESQL) $(LIBS_DLL) -o $@ -$(BINDIR)/cats_sqlite.dll: $(addprefix $(OBJDIR)/cats_sqlite/,sqlite.o $(SQL_OBJS)) $(OBJDIR)/libcats.exp +$(BINDIR)/cats_sqlite3.dll: $(addprefix $(OBJDIR)/cats_sqlite3/,sqlite.o $(SQL_OBJS)) $(OBJDIR)/libcats.exp @echo "Linking $@" $(call checkdir,$@) $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows $^ $(LIBS_SQLITE) $(LIBS_DLL) -o $@ @@ -94,7 +94,7 @@ endef $(eval $(call Link_Dll,cats_mysql,MYSQL)) -$(eval $(call Link_Dll,cats_pgsql,POSTGRESQL)) +$(eval $(call Link_Dll,cats_postgresql,POSTGRESQL)) -$(eval $(call Link_Dll,cats_sqlite,SQLITE3)) +$(eval $(call Link_Dll,cats_sqlite3,SQLITE3)) diff --git a/bacula/src/win32/cats/cats_pgsql/cats_pgsql.vcproj b/bacula/src/win32/cats/cats_pgsql/cats_pgsql.vcproj deleted file mode 100644 index 8c2bff07c0..0000000000 --- a/bacula/src/win32/cats/cats_pgsql/cats_pgsql.vcproj +++ /dev/null @@ -1,432 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bacula/src/win32/cats/cats_postgresql/cats_postgresql.vcproj b/bacula/src/win32/cats/cats_postgresql/cats_postgresql.vcproj new file mode 100644 index 0000000000..78b46d9342 --- /dev/null +++ b/bacula/src/win32/cats/cats_postgresql/cats_postgresql.vcproj @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/win32/cats/cats_sqlite/cats_sqlite.vcproj b/bacula/src/win32/cats/cats_sqlite/cats_sqlite.vcproj deleted file mode 100644 index 4cf8315723..0000000000 --- a/bacula/src/win32/cats/cats_sqlite/cats_sqlite.vcproj +++ /dev/null @@ -1,421 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bacula/src/win32/cats/cats_sqlite3/cats_sqlite3.vcproj b/bacula/src/win32/cats/cats_sqlite3/cats_sqlite3.vcproj new file mode 100644 index 0000000000..7eb1bc579e --- /dev/null +++ b/bacula/src/win32/cats/cats_sqlite3/cats_sqlite3.vcproj @@ -0,0 +1,421 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/win32/console/ReadMe.txt b/bacula/src/win32/console/ReadMe.txt deleted file mode 100644 index 514964ec32..0000000000 --- a/bacula/src/win32/console/ReadMe.txt +++ /dev/null @@ -1,34 +0,0 @@ -======================================================================== - CONSOLE APPLICATION : console -======================================================================== - - -AppWizard has created this console application for you. - -This file contains a summary of what you will find in each of the files that -make up your console application. - -console.dsp - This file (the project file) contains information at the project level and - is used to build a single project or subproject. Other users can share the - project (.dsp) file, but they should export the makefiles locally. - -console.cpp - This is the main application source file. - - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named console.pch and a precompiled types file named StdAfx.obj. - - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff --git a/bacula/src/win32/console/console.dsp b/bacula/src/win32/console/console.dsp deleted file mode 100644 index 82bc19883d..0000000000 --- a/bacula/src/win32/console/console.dsp +++ /dev/null @@ -1,300 +0,0 @@ -# Microsoft Developer Studio Project File - Name="console" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=console - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "console.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "console.mak" CFG="console - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "console - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "console - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "console - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "." /D "_DEBUG" /D "HAVE_CONSOLE" /D "_WINMAIN_" /D "PTW32_BUILD" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "_AFXDLL" /FD /I /GZ /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib pthreadVCE.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"Release/bconsole.exe" /libpath:"../../../../depkgs-win32/pthreads" - -!ELSEIF "$(CFG)" == "console - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "." /D "_DEBUG" /D "HAVE_CONSOLE" /D "_WINMAIN_" /D "PTW32_BUILD" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "_AFXDLL" /FD /I /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib pthreadVCE.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"Debug/bconsole.exe" /libpath:"../../../../depkgs-win32/pthreads" - -!ENDIF - -# Begin Target - -# Name "console - Win32 Release" -# Name "console - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\lib\alist.cpp -# End Source File -# Begin Source File - -SOURCE=.\authenticate.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\base64.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\bnet.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\bsys.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\btime.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\btimers.cpp -# End Source File -# Begin Source File - -SOURCE=..\compat\compat.cpp -# End Source File -# Begin Source File - -SOURCE=.\console.cpp -# End Source File -# Begin Source File - -SOURCE=.\console_conf.cpp -# End Source File -# Begin Source File - -SOURCE="..\lib\cram-md5.cpp" -# End Source File -# Begin Source File - -SOURCE=..\lib\crc32.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\dlist.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\edit.cpp -# End Source File -# Begin Source File - -SOURCE=..\compat\getopt.c -# End Source File -# Begin Source File - -SOURCE=..\lib\hmac.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\idcache.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\jcr.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\lex.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\md5.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\mem_pool.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\message.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\parse_conf.cpp -# End Source File -# Begin Source File - -SOURCE=..\compat\print.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\queue.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\rwlock.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\scan.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\serial.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sha1.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\smartall.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=..\lib\util.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\watchdog.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\compat\alloca.h -# End Source File -# Begin Source File - -SOURCE=..\compat\compat.h -# End Source File -# Begin Source File - -SOURCE=..\compat\dirent.h -# End Source File -# Begin Source File - -SOURCE=..\compat\getopt.h -# End Source File -# Begin Source File - -SOURCE=..\compat\grp.h -# End Source File -# Begin Source File - -SOURCE=..\compat\mswinver.h -# End Source File -# Begin Source File - -SOURCE=..\compat\netdb.h -# End Source File -# Begin Source File - -SOURCE=..\compat\pwd.h -# End Source File -# Begin Source File - -SOURCE=..\compat\sched.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=..\compat\stdint.h -# End Source File -# Begin Source File - -SOURCE=..\compat\strings.h -# End Source File -# Begin Source File - -SOURCE=..\compat\syslog.h -# End Source File -# Begin Source File - -SOURCE=..\compat\unistd.h -# End Source File -# Begin Source File - -SOURCE=..\compat\winconfig.h -# End Source File -# Begin Source File - -SOURCE=..\compat\winhost.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/bacula/src/win32/console/console.dsw b/bacula/src/win32/console/console.dsw deleted file mode 100644 index 089fc6c3ca..0000000000 --- a/bacula/src/win32/console/console.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "console"=.\console.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bacula/src/win32/dird/dird.vcproj b/bacula/src/win32/dird/dird.vcproj index ba0db569a3..4a11e26435 100644 --- a/bacula/src/win32/dird/dird.vcproj +++ b/bacula/src/win32/dird/dird.vcproj @@ -28,10 +28,6 @@ />