Tweak comments + indenting

[bacula/bacula] / bacula / src / filed / job.c

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 66bf6c9735a8e8a7c946604e09c0d3dacbc4d3cf..4a224cd68f9591969de13dece0780ee4c9943ff8 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -647,17 +647,13 @@ static int restore_object_cmd(JCR *jcr)
 
 // Dmsg5(000, "Recv object: JobId=%u objlen=%d objinx=%d objtype=%d FI=%d\n",
 //       JobId, object_len, object_index, object_type, FileIndex);
-   /* Read Fname */
+   /* Read Object name */
    if (dir->recv() < 0) {
       goto bail_out;
    }
-// Dmsg2(000, "Recv Fname object: len=%d Fname=%s\n", dir->msglen, dir->msg);
-   rop.fname = bstrdup(dir->msg);
+// Dmsg2(000, "Recv Fname object: len=%d Oname=%s\n", dir->msglen, dir->msg);
+   rop.object_name = bstrdup(dir->msg);
 
-   /* Read Path */
-   if (dir->recv() < 0) {
-      goto bail_out;
-   }
 // Dmsg2(000, "Recv Path object: len=%d Path=%s\n", dir->msglen, dir->msg);
 
    /* Read Object */
@@ -670,8 +666,8 @@ static int restore_object_cmd(JCR *jcr)
    /* pass to plugin */
    generate_plugin_event(jcr, bEventRestoreObject, (void *)&rop);
 
-   if (rop.fname) {
-      free(rop.fname);
+   if (rop.object_name) {
+      free(rop.object_name);
    }
    if (!rop.object) {
       dir->msg = get_pool_memory(PM_MESSAGE);
@@ -1764,20 +1760,7 @@ static int backup_cmd(JCR *jcr)
 
 cleanup:
 #if defined(WIN32_VSS)
-   /* STOP VSS ON WIN32 */
-   /* tell vss to close the backup session */
    if (jcr->VSS) {
-      if (g_pVSSClient->CloseBackup()) {             
-         /* inform user about writer states */
-         for (int i=0; i<(int)g_pVSSClient->GetWriterCount(); i++) {
-            int msg_type = M_INFO;
-            if (g_pVSSClient->GetWriterState(i) < 1) {
-               msg_type = M_WARNING;
-               jcr->JobErrors++;
-            }
-            Jmsg(jcr, msg_type, 0, _("VSS Writer (BackupComplete): %s\n"), g_pVSSClient->GetWriterInfo(i));
-         }
-      }
       Win32ConvCleanupCache();
       V(vss_mutex);
    }
@@ -1867,8 +1850,7 @@ static int verify_cmd(JCR *jcr)
 #ifdef WIN32_VSS
 static bool vss_restore_init_callback(JCR *jcr, int init_type)
 {
-   switch (init_type)
-   {
+   switch (init_type) {
    case VSS_INIT_RESTORE_AFTER_INIT:
       generate_plugin_event(jcr, bEventVssRestoreLoadComponentMetadata);
       return true;