summaryrefslogtreecommitdiff
path: root/src/sort.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1997-10-13 03:26:39 +0000
committerJim Meyering <jim@meyering.net>1997-10-13 03:26:39 +0000
commit045d8da585758e74d34aff88e6e95b4af1a8527c (patch)
tree69196bb6b70eebc0876df0d3d36e4519cd7016f6 /src/sort.c
parent0ac3a6acde9be6deede227e9626f0e55453a70a0 (diff)
downloadcoreutils-045d8da585758e74d34aff88e6e95b4af1a8527c.tar.xz
Indent some more.
#ifdef ENABLE_NLS th NLS part of insertkey.
Diffstat (limited to 'src/sort.c')
-rw-r--r--src/sort.c40
1 files changed, 24 insertions, 16 deletions
diff --git a/src/sort.c b/src/sort.c
index 293f97073..ca3abe5e8 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -235,10 +235,13 @@ static struct month nls_monthtab[NLS_NUM_MONTHS];
static int nls_months_collide[NLS_NUM_MONTHS + 1];
/* Numeric keys, to search for numeric format */
-static struct nls_keyfield {
+struct nls_keyfield
+{
struct keyfield *key;
struct nls_keyfield *next;
-} *nls_keyhead = NULL;
+};
+
+static struct nls_keyfield *nls_keyhead = NULL;
#endif
@@ -1010,7 +1013,7 @@ fraccompare (register const char *a, register const char *b)
return 1;
return 0;
}
- if (digits[tmpb])
+ if (ISDIGIT (tmpb))
{
while (tmpb == NUMERIC_ZERO)
tmpb = *++b;
@@ -1302,7 +1305,7 @@ numcompare (register const char *a, register const char *b)
tmpb = UCHAR (*++b);
while (tmpb == NUMERIC_ZERO);
- while (tmpa == tmpb && digits[tmpa])
+ while (tmpa == tmpb && ISDIGIT (tmpa))
tmpa = UCHAR (*++a), tmpb = UCHAR (*++b);
if ((tmpa == decimal_point && !ISDIGIT (tmpb))
@@ -2252,18 +2255,23 @@ insertkey (struct keyfield *key)
k = k->next;
k->next = key;
key->next = NULL;
- if (key->numeric || key->general_numeric) {
- struct nls_keyfield *nk;
-
- nk = (struct nls_keyfield *)xmalloc(sizeof(struct nls_keyfield));
- nk->key = key;
- if (nls_keyhead) {
- nk->next = nls_keyhead->next;
- nls_keyhead->next = nk;
- } else
- nk->next = nk;
- nls_keyhead = nk;
- }
+#ifdef ENABLE_NLS
+ if (key->numeric || key->general_numeric)
+ {
+ struct nls_keyfield *nk;
+
+ nk = (struct nls_keyfield *) xmalloc (sizeof (struct nls_keyfield));
+ nk->key = key;
+ if (nls_keyhead)
+ {
+ nk->next = nls_keyhead->next;
+ nls_keyhead->next = nk;
+ }
+ else
+ nk->next = nk;
+ nls_keyhead = nk;
+ }
+#endif
}
static void