ebl Modify disk-changer to check if slot contains something before

[bacula/bacula] / bacula / src / cats / sqlite.c

diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index 9b0ede7ac9878d2cb5d04eb2abc138d7a4bcc3c0..a03691fed1c46bacecb19f576a64fecf400f1c2d 100644 (file)
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -158,8 +158,9 @@ db_open_database(JCR *jcr, B_DB *mdb)
    mdb->connected = FALSE;
 
    if ((errstat=rwl_init(&mdb->lock)) != 0) {
+      berrno be;
       Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
-            strerror(errstat));
+            be.bstrerror(errstat));
       V(mutex);
       return 0;
    }
@@ -211,6 +212,13 @@ db_open_database(JCR *jcr, B_DB *mdb)
    mdb->connected = true;
    free(db_name);
 
+   /* set busy handler to wait when we use mult_db_connections = 1 */
+#ifdef HAVE_SQLITE3
+   sqlite3_busy_handler(mdb->db, my_busy_handler, NULL);
+#else
+   sqlite_busy_handler(mdb->db, my_busy_handler, NULL);
+#endif
+
 #if  defined(HAVE_SQLITE3) && defined(SQLITE3_INIT_QUERY)
    db_sql_query(mdb, SQLITE3_INIT_QUERY, NULL, NULL);
 #endif
@@ -220,12 +228,6 @@ db_open_database(JCR *jcr, B_DB *mdb)
       return 0;
    }
 
-   /* set busy handler to wait when we use mult_db_connections = 1 */
-#ifdef HAVE_SQLITE3
-   sqlite3_busy_handler(mdb->db, my_busy_handler, NULL);
-#else
-   sqlite_busy_handler(mdb->db, my_busy_handler, NULL);
-#endif
 
    V(mutex);
    return 1;
@@ -336,7 +338,7 @@ static int sqlite_result(void *arh_data, int num_fields, char **rows, char **col
  * Submit a general SQL command (cmd), and for each row returned,
  *  the sqlite_handler is called with the ctx.
  */
-int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+bool db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
 {
    struct rh_data rh_data;
    int stat;
@@ -356,10 +358,10 @@ int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler
    if (stat != 0) {
       Mmsg(mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
       db_unlock(mdb);
-      return 0;
+      return false;
    }
    db_unlock(mdb);
-   return 1;
+   return true;
 }
 
 /*
@@ -455,15 +457,18 @@ SQL_FIELD *my_sqlite_fetch_field(B_DB *mdb)
 }
 
 #ifdef HAVE_BATCH_FILE_INSERT
-char *my_sqlite_batch_lock_query = "BEGIN";
-char *my_sqlite_batch_unlock_query = "COMMIT";
-char *my_sqlite_batch_fill_path_query = "INSERT INTO Path (Path)          " 
-                                        " SELECT DISTINCT Path FROM batch "
-                                        " EXCEPT SELECT Path FROM Path    ";
-
-char *my_sqlite_batch_fill_filename_query = "INSERT INTO Filename (Name)       " 
-                                            " SELECT DISTINCT Name FROM batch  "
-                                            " EXCEPT SELECT Name FROM Filename ";
+const char *my_sqlite_batch_lock_query = "BEGIN";
+const char *my_sqlite_batch_unlock_query = "COMMIT";
+
+const char *my_sqlite_batch_fill_path_query = 
+   "INSERT INTO Path (Path)" 
+   " SELECT DISTINCT Path FROM batch"
+   " EXCEPT SELECT Path FROM Path";
+
+const char *my_sqlite_batch_fill_filename_query = 
+   "INSERT INTO Filename (Name)"
+   " SELECT DISTINCT Name FROM batch "
+   " EXCEPT SELECT Name FROM Filename";
 #endif /* HAVE_BATCH_FILE_INSERT */