From acd9f20695641b6fabbb8f50078146f0171a1a93 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Mon, 12 Aug 1996 18:56:38 +0000 Subject: Convert to newly aded collate compare function --- lib/libcompat/regexp/regexp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/libcompat/regexp/regexp.c') diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c index 8bfa3ca6b71c5..963d6abc1b499 100644 --- a/lib/libcompat/regexp/regexp.c +++ b/lib/libcompat/regexp/regexp.c @@ -32,13 +32,14 @@ * precedence is structured in regular expressions. Serious changes in * regular-expression syntax might require a total rethink. */ +#include +#include #include #include #include #include #include #include "regmagic.h" -#include "collate.h" /* * The "internal use only" fields in regexp.h are present to pass info from @@ -507,12 +508,12 @@ int *flagp; else { class = UCHARAT(regparse-2); classend = UCHARAT(regparse); - if (__collcmp(class, classend) > 0) + if (collate_range_cmp(class, classend) > 0) FAIL("invalid [] range"); for (i = 0; i <= UCHAR_MAX; i++) if ( i != class - && __collcmp(class, i) <= 0 - && __collcmp(i, classend) <= 0 + && collate_range_cmp(class, i) <= 0 + && collate_range_cmp(i, classend) <= 0 ) regc(i); regparse++; -- cgit v1.2.3