Changeset 20823 in vbox

Timestamp:

Jun 23, 2009 12:48:34 PM (15 years ago)

Author:

vboxsync

Message:

iprt/stream.cpp: alignment hacks.

File:

• trunk/src/VBox/Runtime/r3/stream.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/r3/stream.cpp

@@ -42 +42 @@
 #include <iprt/param.h>
 #include <iprt/string.h>
+
+#include "internal/alignmentchecks.h"
 #include "internal/magics.h"
 
@@ -402 +404 @@
             if (pcbWritten)
             {
+                IPRT_ALIGNMENT_CHECKS_DISABLE(); /* glibc / mempcpy again */
                 *pcbWritten = fwrite(pvBuf, 1, cbWrite, pStream->pFile);
+                IPRT_ALIGNMENT_CHECKS_ENABLE();
                 if (    *pcbWritten == cbWrite
                     ||  !ferror(pStream->pFile))
@@ -411 +415 @@
             {
                 /*
-                 * Must read it all!
+                 * Must write it all!
                  */
-                if (fwrite(pvBuf, cbWrite, 1, pStream->pFile) == 1)
+                IPRT_ALIGNMENT_CHECKS_DISABLE(); /* glibc / mempcpy again */
+                size_t cbWritten = fwrite(pvBuf, cbWrite, 1, pStream->pFile);
+                IPRT_ALIGNMENT_CHECKS_ENABLE();
+                if (cbWritten == 1)
                     return VINF_SUCCESS;
                 if (!ferror(pStream->pFile))
@@ -500 +507 @@
             {
                 cchString--;            /* save space for the terminator. */
-                #ifdef HAVE_FWRITE_UNLOCKED
+#ifdef HAVE_FWRITE_UNLOCKED
                 flockfile(pStream->pFile);
-                #endif
+#endif
                 for (;;)
                 {
-                    #ifdef HAVE_FWRITE_UNLOCKED
+#ifdef HAVE_FWRITE_UNLOCKED
                     int ch = fgetc_unlocked(pStream->pFile);
-                    #else
+#else
                     int ch = fgetc(pStream->pFile);
-                    #endif
+#endif
                     if (ch == EOF)
                     {
-                        #ifdef HAVE_FWRITE_UNLOCKED
+#ifdef HAVE_FWRITE_UNLOCKED
                         if (feof_unlocked(pStream->pFile))
-                        #else
+#else
                         if (feof(pStream->pFile))
-                        #endif
+#endif
                         {
                             rc = VERR_EOF;
                             break;
                         }
-                        #ifdef HAVE_FWRITE_UNLOCKED
+#ifdef HAVE_FWRITE_UNLOCKED
                         if (ferror_unlocked(pStream->pFile))
-                        #else
+#else
                         if (ferror(pStream->pFile))
-                        #endif
+#endif
                             rc = VERR_READ_ERROR;
                         else
@@ -543 +550 @@
                     }
                 }
-                #ifdef HAVE_FWRITE_UNLOCKED
+#ifdef HAVE_FWRITE_UNLOCKED
                 funlockfile(pStream->pFile);
-                #endif
+#endif
 
                 *pszString = '\0';
@@ -597 +604 @@
         if (RT_SUCCESS(rc))
         {
-            #ifdef HAVE_FWRITE_UNLOCKED
+            IPRT_ALIGNMENT_CHECKS_DISABLE(); /* glibc / mempcpy again */
+#ifdef HAVE_FWRITE_UNLOCKED
             if (fwrite_unlocked(pachChars, cchChars, 1, pStream->pFile) != 1)
-            #else
+#else
             if (fwrite(pachChars, cchChars, 1, pStream->pFile) != 1)
-            #endif
+#endif
                 ASMAtomicXchgS32(&pStream->i32Error, VERR_WRITE_ERROR);
+            IPRT_ALIGNMENT_CHECKS_ENABLE();
         }
     }
@@ -627 +636 @@
         {
             /** @todo consider making this thread safe... */
-            #ifdef HAVE_FWRITE_UNLOCKED
+#ifdef HAVE_FWRITE_UNLOCKED
             flockfile(pStream->pFile);
             rc = (int)RTStrFormatV(rtstrmOutput, pStream, NULL, NULL, pszFormat, args);
             funlockfile(pStream->pFile);
-            #else
+#else
             rc = (int)RTStrFormatV(rtstrmOutput, pStream, NULL, NULL, pszFormat, args);
-            #endif
+#endif
             Assert(rc >= 0);
         }