Changeset 2324

Timestamp:

Sep 26, 2005, 1:41:52 AM (20 years ago)

Author:

bird

Message:

Comments and predictions.

File:

• trunk/src/emx/src/lib/sys/filehandles.c (modified) (5 diffs, 1 prop)

trunk/src/emx/src/lib/sys/filehandles.c

@@ -392 +392 @@
 
         /*
-         * Skip unused ones.
+         * Skip unused and close-on-exec ones.
          */
         while (     iFH < cFHs
@@ -408 +408 @@
         {
             void *pv = realloc(pRet, cb + 0x2000);
-            if (!pv)
+            if (__predict_false(!pv))
             {
                 _fmutex_release(&gmtx);
@@ -460 +460 @@
                     LIBC_ASSERT(gpapFHs[iFH]->pszNativePath && *gpapFHs[iFH]->pszNativePath);
                     u.pDirs->aHandles[i].offNativePath = fhAddString(gpapFHs[iFH]->pszNativePath, ppszStrings, &cbStringAlloc, pcbStrings);
-                    if (!u.pDirs->aHandles[i].offNativePath)
+                    if (__predict_false(!u.pDirs->aHandles[i].offNativePath))
                     {
                         _fmutex_release(&gmtx);
@@ -474 +474 @@
                         ||  !gpapFHs[iFH]
                         ||  !gpapFHs[iFH]->pOps
-                        ||  (gpapFHs[iFH]->pOps->enmType != enmType)
+                        ||  gpapFHs[iFH]->pOps->enmType != enmType
                         ||  (gpapFHs[iFH]->fFlags & ((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT)) )
                         break;
@@ -501 +501 @@
                         ||  !gpapFHs[iFH]
                         ||  !gpapFHs[iFH]->pOps
-                        ||  (gpapFHs[iFH]->pOps->enmType != enmType)
+                        ||  gpapFHs[iFH]->pOps->enmType != enmType
                         ||  (gpapFHs[iFH]->fFlags & ((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT)) )
                         break;