Optimized away a loop in hash_search().
authorWayne Davison <wayned@samba.org>
Fri, 2 Jul 2004 23:35:30 +0000 (23:35 +0000)
committerWayne Davison <wayned@samba.org>
Fri, 2 Jul 2004 23:35:30 +0000 (23:35 +0000)
match.c

diff --git a/match.c b/match.c
index 1eecf3c34a58c3e1258d72f56da8a92c23ef6d56..8470de0cff462b1614ae62cf5b75357f53dc454f 100644 (file)
--- a/match.c
+++ b/match.c
@@ -217,20 +217,13 @@ static void hash_search(int f,struct sum_struct *s,
 
                        /* we've found a match, but now check to see
                         * if last_i can hint at a better match */
-                       for (j++; j < s->count && targets[j].t == t; j++) {
-                               size_t i2 = targets[j].i;
-                               if (i2 == last_i + 1) {
-                                       if (sum != s->sums[i2].sum1)
-                                               break;
-                                       if (memcmp(sum2,s->sums[i2].sum2,s->s2length) != 0)
-                                               break;
-                                       /* we've found an adjacent match - the RLL coder
-                                        * will be happy */
-                                       i = i2;
-                                       break;
-                               }
+                       if (i != last_i + 1 && last_i + 1 < s->count
+                           && sum == s->sums[last_i+1].sum1
+                           && memcmp(sum2, s->sums[last_i+1].sum2, s->s2length) == 0) {
+                               /* we've found an adjacent match - the RLL coder
+                                * will be happy */
+                               i = last_i + 1;
                        }
-
                        last_i = i;
 
                        matched(f,s,buf,offset,i);