Changeset 67124 in vbox for trunk/src/VBox

Timestamp:

May 28, 2017 12:21:57 PM (8 years ago)

Author:

vboxsync

Message:

build fix

File:

• trunk/src/VBox/Runtime/common/zip/tarcmd.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/zip/tarcmd.cpp

@@ -64 +64 @@
 
 /** File format. */
-typedef enum RTZIPTARFORMAT
+typedef enum RTZIPTARCMDFORMAT
 {
-    RTZIPTARFORMAT_INVALID = 0,
+    RTZIPTARCMDFORMAT_INVALID = 0,
     /** Autodetect if possible, defaulting to TAR. */
-    RTZIPTARFORMAT_AUTO_DEFAULT,
+    RTZIPTARCMDFORMAT_AUTO_DEFAULT,
     /** TAR.  */
-    RTZIPTARFORMAT_TAR,
+    RTZIPTARCMDFORMAT_TAR,
     /** XAR.  */
-    RTZIPTARFORMAT_XAR
-} RTZIPTARFORMAT;
+    RTZIPTARCMDFORMAT_XAR
+} RTZIPTARCMDFORMAT;
 
 
@@ -85 +85 @@
 {
     /** The file format. */
-    RTZIPTARFORMAT  enmFormat;
+    RTZIPTARCMDFORMAT enmFormat;
 
     /** The operation (Acdrtux or RTZIPTARCMD_OPT_DELETE). */
@@ -258 +258 @@
      * Open the filesystem stream.
      */
-    if (pOpts->enmFormat == RTZIPTARFORMAT_TAR)
+    if (pOpts->enmFormat == RTZIPTARCMDFORMAT_TAR)
         rc = RTZipTarFsStreamFromIoStream(hVfsIos, 0/*fFlags*/, phVfsFss);
-    else if (pOpts->enmFormat == RTZIPTARFORMAT_XAR)
+    else if (pOpts->enmFormat == RTZIPTARCMDFORMAT_XAR)
 #ifdef IPRT_WITH_XAR /* Requires C++ and XML, so only in some configruation of IPRT. */
         rc = RTZipXarFsStreamFromIoStream(hVfsIos, 0/*fFlags*/, phVfsFss);
@@ -1011 +1011 @@
     RTZIPTARCMDOPS Opts;
     RT_ZERO(Opts);
-    Opts.enmFormat = RTZIPTARFORMAT_AUTO_DEFAULT;
+    Opts.enmFormat = RTZIPTARCMDFORMAT_AUTO_DEFAULT;
     Opts.uidOwner = NIL_RTUID;
     Opts.gidGroup = NIL_RTUID;
@@ -1140 +1140 @@
             case RTZIPTARCMD_OPT_FORMAT:
                 if (!strcmp(ValueUnion.psz, "auto") || !strcmp(ValueUnion.psz, "default"))
-                    Opts.enmFormat = RTZIPTARFORMAT_AUTO_DEFAULT;
+                    Opts.enmFormat = RTZIPTARCMDFORMAT_AUTO_DEFAULT;
                 else if (!strcmp(ValueUnion.psz, "tar"))
-                    Opts.enmFormat = RTZIPTARFORMAT_TAR;
+                    Opts.enmFormat = RTZIPTARCMDFORMAT_TAR;
                 else if (!strcmp(ValueUnion.psz, "xar"))
-                    Opts.enmFormat = RTZIPTARFORMAT_XAR;
+                    Opts.enmFormat = RTZIPTARCMDFORMAT_XAR;
                 else
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Unknown archive format: '%s'", ValueUnion.psz);