1 files changed, 17 insertions, 15 deletions

diff --git a/core/src/stored/btape.cc b/core/src/stored/btape.cc
index 39ae5ca7c..382c12343 100644
--- a/core/src/stored/btape.cc
+++ b/core/src/stored/btape.cc
@@ -42,7 +42,7 @@
 #include "stored/btape_device_control_record.h"
 #include "stored/butil.h"
 #include "stored/device.h"
-#include "stored/jcr_private.h"
+#include "stored/stored_jcr_impl.h"
 #include "stored/label.h"
 #include "stored/read_record.h"
 #include "stored/sd_backends.h"
@@ -322,7 +322,7 @@ int main(int margc, char* margv[])
                  false); /* write device */
   if (!jcr) { exit(1); }
 
-  dev = jcr->impl->dcr->dev;
+  dev = jcr->sd_impl->dcr->dev;
   if (!dev) { exit(1); }
 
   if (!dev->IsTape()) {
@@ -2145,7 +2145,7 @@ static void fillcmd()
     exit_code = 1;
     return;
   }
-  block = jcr->impl->dcr->block;
+  block = jcr->sd_impl->dcr->block;
 
   Dmsg0(100, "Just after AcquireDeviceForAppend\n");
   // Write Begin Session Record
@@ -2165,7 +2165,7 @@ static void fillcmd()
   FillBuffer(FILL_RANDOM, rec.data, rec.data_len);
 
   // Generate data as if from File daemon, write to device
-  jcr->impl->dcr->VolFirstIndex = 0;
+  jcr->sd_impl->dcr->VolFirstIndex = 0;
   time(&jcr->run_time); /* start counting time for rates */
 
   bstrftime(buf1, sizeof(buf1), jcr->run_time, "%H:%M:%S");
@@ -2309,15 +2309,17 @@ static void fillcmd()
       Pmsg3(0,
             _("\n\n%s Done filling tape at %d:%d. Now beginning re-read of "
               "tape ...\n"),
-            buf1, jcr->impl->dcr->dev->file, jcr->impl->dcr->dev->block_num);
+            buf1, jcr->sd_impl->dcr->dev->file,
+            jcr->sd_impl->dcr->dev->block_num);
     } else {
       Pmsg3(0,
             _("\n\n%s Done filling tapes at %d:%d. Now beginning re-read of "
               "first tape ...\n"),
-            buf1, jcr->impl->dcr->dev->file, jcr->impl->dcr->dev->block_num);
+            buf1, jcr->sd_impl->dcr->dev->file,
+            jcr->sd_impl->dcr->dev->block_num);
     }
 
-    jcr->impl->dcr->block = block;
+    jcr->sd_impl->dcr->block = block;
     if (!do_unfill()) {
       Pmsg0(000, _("do_unfill failed.\n"));
       exit_code = 1;
@@ -2410,13 +2412,13 @@ static bool do_unfill()
   last_block = last_block1;
 
   FreeRestoreVolumeList(jcr);
-  jcr->impl->read_session.bsr = nullptr;
+  jcr->sd_impl->read_session.bsr = nullptr;
   bstrncpy(dcr->VolumeName, "TestVolume1|TestVolume2", sizeof(dcr->VolumeName));
   CreateRestoreVolumeList(jcr);
-  if (jcr->impl->VolList != nullptr) {
-    jcr->impl->VolList->Slot = 1;
-    if (jcr->impl->VolList->next != nullptr) {
-      jcr->impl->VolList->next->Slot = 2;
+  if (jcr->sd_impl->VolList != nullptr) {
+    jcr->sd_impl->VolList->Slot = 1;
+    if (jcr->sd_impl->VolList->next != nullptr) {
+      jcr->sd_impl->VolList->next->Slot = 2;
     }
   }
 
@@ -2437,7 +2439,7 @@ static bool do_unfill()
 
   dev->close(dcr);
   dev->num_writers = 0;
-  jcr->impl->dcr->clear_will_write();
+  jcr->sd_impl->dcr->clear_will_write();
 
   if (!AcquireDeviceForRead(dcr)) {
     Pmsg1(-1, "%s", dev->errmsg);
@@ -2663,7 +2665,7 @@ static int FlushBlock(DeviceBlock* block)
       stop = -1; /* stop, but do simplified test */
     } else {
       /* Full test in progress */
-      if (!FixupDeviceBlockWriteError(jcr->impl->dcr)) {
+      if (!FixupDeviceBlockWriteError(jcr->sd_impl->dcr)) {
         Pmsg1(000, _("Cannot fixup device error. %s\n"), dev->bstrerror());
         ok = false;
         dev->Unlock();
@@ -3007,7 +3009,7 @@ static bool MyMountNextReadVolume(DeviceControlRecord* dcr)
 
 static void SetVolumeName(const char* VolName, int volnum)
 {
-  DeviceControlRecord* dcr = jcr->impl->dcr;
+  DeviceControlRecord* dcr = jcr->sd_impl->dcr;
   volumename = VolName;
   vol_num = volnum;
   dev->setVolCatName(VolName);