]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/stored/bscan.c
Use rentrant mysql lib, eliminate race in sql_list, Win32 streams, misc see kes-1.31
[bacula/bacula] / bacula / src / stored / bscan.c
index c185e03cca5b7d7f7e50b98a017216f710b53142..b0a4493fd05c6cc5fbd2542549ddd30ee9fb7d34 100644 (file)
@@ -54,7 +54,9 @@ static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type);
 
 
 /* Global variables */
-static STORES *me;
+STORES *me;
+
+/* Local variables */
 static DEVICE *dev = NULL;
 static B_DB *db;
 static JCR *bjcr;                    /* jcr for bscan */
@@ -81,7 +83,6 @@ static char *db_name = "bacula";
 static char *db_user = "bacula";
 static char *db_password = "";
 static char *wd = NULL;
-static int verbose = 0;
 static int update_db = 0;
 static int update_vol_info = 0;
 static int list_records = 0;
@@ -972,8 +973,8 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
       case JS_ErrorTerminated:
          term_msg = _("*** Backup Error ***");
         break;
-      case JS_Cancelled:
-         term_msg = _("Backup Cancelled");
+      case JS_Canceled:
+         term_msg = _("Backup Canceled");
         break;
       default:
         term_msg = term_code;