Changeset 59577 in vbox for trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

Timestamp:

Feb 4, 2016 2:18:36 PM (9 years ago)

Author:

vboxsync

Message:

Main: Removed the VBOX_WITH_S3 code because we haven't maintained it properly for years.

File:

• trunk/src/VBox/Main/src-server/ApplianceImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

@@ -1187 +1187 @@
  * Thread function for the thread started in Appliance::readImpl() and Appliance::importImpl()
  * and Appliance::writeImpl().
- * This will in turn call Appliance::readFS() or Appliance::readS3() or Appliance::importFS()
- * or Appliance::importS3() or Appliance::writeFS() or Appliance::writeS3().
+ *
+ * This will in turn call Appliance::readFS() or Appliance::importFS() or
+ * Appliance::writeFS().
  *
  * @param aThread
@@ -1212 +1213 @@
                 taskrc = pAppliance->i_readFS(task);
             else if (task->locInfo.storageType == VFSType_S3)
-#ifdef VBOX_WITH_S3
-                taskrc = pAppliance->i_readS3(task);
-#else
                 taskrc = VERR_NOT_IMPLEMENTED;
-#endif
         break;
 
@@ -1223 +1220 @@
                 taskrc = pAppliance->i_importFS(task);
             else if (task->locInfo.storageType == VFSType_S3)
-#ifdef VBOX_WITH_S3
-                taskrc = pAppliance->i_importS3(task);
-#else
                 taskrc = VERR_NOT_IMPLEMENTED;
-#endif
         break;
 
@@ -1234 +1227 @@
                 taskrc = pAppliance->i_writeFS(task);
             else if (task->locInfo.storageType == VFSType_S3)
-#ifdef VBOX_WITH_S3
-                taskrc = pAppliance->i_writeS3(task);
-#else
                 taskrc = VERR_NOT_IMPLEMENTED;
-#endif
         break;
     }