Changeset 95924 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 28, 2022 10:46:52 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/zip.cpp: Adjustments for IPRT_NO_CRT mode. Need to disable LZF then because it uses errno (cannot modify it either as using a system lzf lib is VBox build options). bugref:10261

File:

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

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

@@ -32 +32 @@
 #define RTZIP_USE_ZLIB 1
 //#define RTZIP_USE_BZLIB 1
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IPRT_NO_CRT)
 # define RTZIP_USE_LZF 1
 #endif
@@ -1173 +1173 @@
             if (cbOutput != cbUncompressed)
             {
+# ifndef IPRT_NO_CRT /* no errno */
                 AssertMsgFailed(("Decompression error, errno=%d. cbOutput=%#x cbUncompressed=%#x\n",
                                  errno, cbOutput, cbUncompressed));
+# endif
                 return VERR_GENERAL_FAILURE; /** @todo Get better error codes for RTZip! */
             }
@@ -1186 +1188 @@
             if (cbOutput != cbUncompressed)
             {
+# ifndef IPRT_NO_CRT /* no errno */
                 AssertMsgFailed(("Decompression error, errno=%d. cbOutput=%#x cbUncompressed=%#x\n",
                                  errno, cbOutput, cbUncompressed));
+# endif
                 return VERR_GENERAL_FAILURE; /** @todo Get better error codes for RTZip! */
             }
@@ -1858 +1862 @@
             if (RT_UNLIKELY(cbDstActual < 1))
             {
+# ifndef IPRT_NO_CRT /* no errno */
                 if (errno == E2BIG)
                     return VERR_BUFFER_OVERFLOW;
                 Assert(errno == EINVAL);
+# endif
                 return VERR_GENERAL_FAILURE;
             }