Changeset 1087 in kBuild

Timestamp:

Aug 29, 2007 12:40:58 PM (17 years ago)

Author:

bird

Message:

When matching the current line, the newline must be included or we might end up spinning for ever if the 2nd line is a subset of the 1st. Part of the blame here is also on the buffer realignment, which would cause us to be stuck on the same line.

File:

• trunk/src/kObjCache/kObjCache.c (modified) (2 diffs)

trunk/src/kObjCache/kObjCache.c

@@ -2531 +2531 @@
             /* Match the current line. */
             psz = memchr(psz1, '\n', pszEnd1 - psz1);
-            if (!psz)
+            if (!psz++)
                 psz = pszEnd1;
             cch = psz - psz1;
@@ -2559 +2559 @@
             }
 
-            /* Try align psz1 on 8 or 4 bytes so at least one of the buffers are aligned. */
+            /* Advance. We might now have a misaligned buffer, but that's memcmps problem... */
             psz1 += cch;
             psz2 += cch;
-            if (cch >= ((uintptr_t)psz1 & 7))
-            {
-                psz2 -= ((uintptr_t)psz1 & 7);
-                psz1 -= ((uintptr_t)psz1 & 7);
-            }
-            else if (cch >= ((uintptr_t)psz1 & 3))
-            {
-                psz2 -= ((uintptr_t)psz1 & 3);
-                psz1 -= ((uintptr_t)psz1 & 3);
-            }
         }
     }