[PATCH 4/8] sort: replace loop with MIN()

From: Jakob Kramer <jakob.kramer_AT_gmx.de>
Date: Sat, 3 May 2014 18:52:18 +0200

---
 sort.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sort.c b/sort.c
index deab422..3614853 100644
--- a/sort.c
+++ b/sort.c
_AT_@ -213,17 +213,14 @@ columns(char *line, const struct keydef *kd)
 {
 	char *start, *end;
 	char *res;
-	unsigned int i;
 
 	start = skip_columns(line, kd->start_column);
-	for(i = 1; i < kd->start_char && *start && !isblank(*start); i++)
-		start++;
+	start += MIN(kd->start_char, next_blank(start) - start) - 1;
 
 	if(kd->end_column) {
 		end = skip_columns(line, kd->end_column);
 		if(kd->end_char)
-			for(i = 1; i < kd->end_char && *end && !isblank(*end); i++)
-				end++;
+			end += MIN(kd->end_char, next_blank(end) - end);
 		else
 			end = next_blank(end);
 	} else {
-- 
1.8.5.1
--/04w6evG8XlLl3ft
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0005-sort-don-t-evaluate-if-clause.patch"
Received on Mon Sep 17 2001 - 00:00:00 CEST

This archive was generated by hypermail 2.3.0 : Sat May 03 2014 - 21:36:07 CEST