[hackers] [sbase] sort: remove 'rest' variable || Jakob Kramer

From: <git_AT_suckless.org>
Date: Sun, 04 May 2014 01:15:19 +0200

commit 56e1616486154d0d15fe04567a16328b2a94d51a
Author: Jakob Kramer <jakob.kramer_AT_gmx.de>
Date: Sat May 3 18:44:10 2014 +0200

    sort: remove 'rest' variable

diff --git a/sort.c b/sort.c
index be1f699..deab422 100644
--- a/sort.c
+++ b/sort.c
_AT_@ -211,26 +211,23 @@ skip_columns(char *s, size_t n)
 static char *
 columns(char *line, const struct keydef *kd)
 {
- char *rest;
         char *start, *end;
         char *res;
         unsigned int i;
 
- rest = skip_columns(line, kd->start_column);
- for(i = 1; i < kd->start_char && *rest && !isblank(*rest); i++)
- rest++;
- start = rest;
+ start = skip_columns(line, kd->start_column);
+ for(i = 1; i < kd->start_char && *start && !isblank(*start); i++)
+ start++;
 
         if(kd->end_column) {
- rest = skip_columns(line, kd->end_column);
+ end = skip_columns(line, kd->end_column);
                 if(kd->end_char)
- for(i = 1; i < kd->end_char && *rest && !isblank(*rest); i++)
- rest++;
+ for(i = 1; i < kd->end_char && *end && !isblank(*end); i++)
+ end++;
                 else
- rest = next_blank(rest);
- end = rest - 1;
+ end = next_blank(end);
         } else {
- end = rest + strlen(rest);
+ end = line + strlen(line);
         }
 
         if((res = strndup(start, end - start)) == NULL)
Received on Sun May 04 2014 - 01:15:19 CEST