diff options
author | Jim Meyering <meyering@redhat.com> | 2008-08-15 09:48:43 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-08-15 10:18:51 +0200 |
commit | 929479026b3fd5910c165c22e1fae9f02e773342 (patch) | |
tree | 738dd6b61eded668cd30ba4b1636d3b9ba8cb96b /src | |
parent | 4c9fae4e97d95a9f89d1399a8aeb03051f0fec96 (diff) | |
download | coreutils-929479026b3fd5910c165c22e1fae9f02e773342.tar.xz |
adjust
Diffstat (limited to 'src')
-rw-r--r-- | src/sort.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/sort.c b/src/sort.c index 4e5fc84c7..a617517b7 100644 --- a/src/sort.c +++ b/src/sort.c @@ -1822,19 +1822,19 @@ compare_random (char *restrict texta, size_t lena, static int compare_version (char *restrict texta, size_t lena, - char *restrict textb, size_t lenb) + char *restrict textb, size_t lenb) { int diff; - /* - * It is necessary to save the character after the end of the field. - * "strverscmp" works with NUL terminated strings. Our blocks of - * text are not necessarily terminated with a NUL byte. - */ + /* It is necessary to save the character after the end of the field. + "strverscmp" works with NUL terminated strings. Our blocks of + text are not necessarily terminated with a NUL byte. */ char sv_a = texta[lena]; char sv_b = textb[lenb]; - texta[lena] = textb[lenb] = '\0'; + texta[lena] = '\0'; + textb[lenb] = '\0'; + diff = strverscmp (texta, textb); texta[lena] = sv_a; @@ -1882,10 +1882,8 @@ keycompare (const struct line *a, const struct line *b) (texta, textb)); *lima = savea, *limb = saveb; } - else if (key->version) - diff = compare_version (texta, lena, textb, lenb); - + diff = compare_version (texta, lena, textb, lenb); else if (key->month) diff = getmonth (texta, lena) - getmonth (textb, lenb); /* Sorting like this may become slow, so in a simple locale the user @@ -2745,7 +2743,7 @@ check_ordering_compatibility (void) + key->version + !!key->ignore)) || (key->random && key->translate)) { - /* The following is too big, but guaranteed to be "big enough". */ + /* The following is too big, but guaranteed to be "big enough". */ char opts[sizeof short_options]; char *p = opts; if (key->ignore == nondictionary) |