Changeset 23342 in vbox for trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp

Timestamp:

Sep 25, 2009 4:28:23 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52859

Message:

AIO/Posix: Fix error code conversion on Darwin

File:

• trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp

@@ -558 +558 @@
                 {
                     pReqInt = pahReqs[i];
+
                     rcPosix = aio_error(&pReqInt->AioCB);
+                    Assert(rcPosix != 0);
+
                     if (rcPosix != EINPROGRESS)
                     {
@@ -570 +573 @@
                             /* An error occurred. */
                             RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+
+                            /*
+                             * Looks like Apple and glibc interpret the standard in different ways.
+                             * glibc returns the error code which would be in errno but Apple returns
+                             * -1 and sets errno to the appropriate value
+                             */
+#if defined(RT_OS_DARWIN)
+                            Assert(rcPosix == -1)
+                            pReqInt->Rc = RTErrConvertFromErrno(errno);
+#elif defined(RT_OS_LINUX)
                             pReqInt->Rc = RTErrConvertFromErrno(rcPosix);
+#endif
                             pReqInt->cbTransfered = 0;
                         }