Tweak some comments and formatting.

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

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 22ff00a72a228ab7725d1c37dd6b6571cb3bc8ed..422edd888b2f04471a2d34dabae3b3f8f2c2198f 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -30,7 +30,6 @@
  *
  *    Kern Sibbald, March 2000
  *
- *    Version $Id: sql_update.c 8478 2009-02-18 20:11:55Z kerns $
  */
 
 #include "bacula.h"
@@ -135,12 +134,19 @@ int
 db_update_stats(JCR *jcr, B_DB *mdb, utime_t age)
 {
    char ed1[30];
+   int rows;
    utime_t now = (utime_t)time(NULL);
    edit_uint64(now - age, ed1);
 
+   db_lock(mdb);
+
    Mmsg(mdb->cmd, fill_jobhisto, ed1);
    QUERY_DB(jcr, mdb, mdb->cmd); /* TODO: get a message ? */
-   return sql_affected_rows(mdb);
+   rows = sql_affected_rows(mdb);
+
+   db_unlock(mdb);
+
+   return rows;
 }
 
 /*
@@ -247,7 +253,7 @@ int db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
    db_lock(mdb);
    mdb->db_escape_string(jcr, esc, cr->Counter, strlen(cr->Counter));
    Mmsg(mdb->cmd,
-"UPDATE Counters SET \"MinValue\"=%d,\"MaxValue\"=%d,CurrentValue=%d,"
+"UPDATE Counters SET Counters.MinValue=%d,Counters.MaxValue=%d,CurrentValue=%d,"
 "WrapCounter='%s' WHERE Counter='%s'",
       cr->MinValue, cr->MaxValue, cr->CurrentValue,
       cr->WrapCounter, esc);