From ef57b948cc7386748324b6b9680a9cd06aaa48f3 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 8 Dec 2006 06:49:38 +0000 Subject: [PATCH] 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 --- bacula/autoconf/configure.in | 2 +- bacula/src/cats/mysql.c | 2 +- bacula/src/filed/backup.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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; -- 2.39.5