From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 11 Sep 2003 23:41:38 +0000 (+0000)
Subject: Retry logic is not needed.
X-Git-Tag: 1.3~9
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=4ac9e96757f0b90c9407884eb85d74364b744006;p=comparator.git

Retry logic is not needed.
---

diff --git a/report.c b/report.c
index ebaa472..64159c5 100644
--- a/report.c
+++ b/report.c
@@ -102,7 +102,6 @@ static int sametree(const char *s, const char *t)
 static void collapse_ranges(struct match_t *reduced, int *nonuniques)
 /* collapse together overlapping ranges in the hit list */
 { 
-    unsigned int retry;
     struct match_t *sp, *tp;
 
 #ifdef DEBUG
@@ -117,53 +116,47 @@ static void collapse_ranges(struct match_t *reduced, int *nonuniques)
 #endif /* DEBUG */
 
      /* time to merge overlapping shreds */
-     do {
-	 retry = 0;
-	 for (sp = reduced; sp->next; sp = sp->next)
-	     for (tp = reduced; tp->next; tp = tp->next)
-	     {
-		 /* intersection is symmetrical */
-		 if (sp >= tp)
-		     continue;
+     for (sp = reduced; sp->next; sp = sp->next)
+	 for (tp = reduced; tp->next; tp = tp->next)
+	 {
+	     /* intersection is symmetrical */
+	     if (sp >= tp)
+		 continue;
 #ifdef DEBUG
-		 printf("Trying merge of %d into %d\n", tp->index, sp->index);
+	     printf("Trying merge of %d into %d\n", tp->index, sp->index);
 #endif /* DEBUG */
-		 /* neither must have been deleted */
-		 if (!sp->matches || !tp->matches)
-		 {
+	     /* neither must have been deleted */
+	     if (!sp->matches || !tp->matches)
+	     {
 #ifdef DEBUG
-		     printf("Null match pointer: %d=%p, %d=%p\n", 
-			    sp->index, sp->matches, tp->index, tp->matches);
+		 printf("Null match pointer: %d=%p, %d=%p\n", 
+			sp->index, sp->matches, tp->index, tp->matches);
 #endif /* DEBUG */
-		     continue;
-		 }
-		 /* ranges must be the same length */
-		 if (sp->nmatches != tp->nmatches)
-		 {
+		 continue;
+	     }
+	     /* ranges must be the same length */
+	     if (sp->nmatches != tp->nmatches)
+	     {
 #ifdef DEBUG
-		     printf("Range length mismatch\n");
+		 printf("Range length mismatch\n");
 #endif /* DEBUG */
-		     continue;
-		 }
-		 /* attempt the merge */
-		 if (merge_ranges(sp->matches, tp->matches, sp->nmatches))
- 		 {		 
+		 continue;
+	     }
+	     /* attempt the merge */
+	     if (merge_ranges(sp->matches, tp->matches, sp->nmatches))
+	     {		 
 #ifdef DEBUG
-		     struct range_t	*rp;
+		 struct range_t	*rp;
 
-		     printf("Merged %d into %d\n", tp->index, sp->index);
-		     for (rp=sp->matches; rp < sp->matches+sp->nmatches; rp++)
-			 printf("%s:%d:%d\n",  rp->file, rp->start, rp->end);
+		 printf("Merged %d into %d\n", tp->index, sp->index);
+		 for (rp=sp->matches; rp < sp->matches+sp->nmatches; rp++)
+		     printf("%s:%d:%d\n",  rp->file, rp->start, rp->end);
 #endif /* DEBUG */
-		     free(tp->matches);
-		     (*nonuniques)--;
-		     tp->matches = NULL;
-		     /* list is altered, do another merge pass */
-		     retry++;
-		 }
+		 free(tp->matches);
+		 (*nonuniques)--;
+		 tp->matches = NULL;
 	     }
-     } while
-	 (retry);
+	 }
 }
 
 struct match_t *reduce_matches(struct sorthash_t *obarray, int *hashcountp)