Replace collate_range_cmp call with its code
This commit is contained in:
parent
81ff4cc5c7
commit
1890d8d6a5
@ -33,7 +33,6 @@
|
|||||||
* regular-expression syntax might require a total rethink.
|
* regular-expression syntax might require a total rethink.
|
||||||
*/
|
*/
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <locale.h>
|
|
||||||
#include <regexp.h>
|
#include <regexp.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
@ -182,10 +181,28 @@ STATIC void regc();
|
|||||||
STATIC void reginsert();
|
STATIC void reginsert();
|
||||||
STATIC void regtail();
|
STATIC void regtail();
|
||||||
STATIC void regoptail();
|
STATIC void regoptail();
|
||||||
|
STATIC int collate_range_cmp();
|
||||||
#ifdef STRCSPN
|
#ifdef STRCSPN
|
||||||
STATIC int strcspn();
|
STATIC int strcspn();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static int collate_range_cmp (c1, c2)
|
||||||
|
int c1, c2;
|
||||||
|
{
|
||||||
|
static char s1[2], s2[2];
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
c1 &= UCHAR_MAX;
|
||||||
|
c2 &= UCHAR_MAX;
|
||||||
|
if (c1 == c2)
|
||||||
|
return (0);
|
||||||
|
s1[0] = c1;
|
||||||
|
s2[0] = c2;
|
||||||
|
if ((ret = strcoll(s1, s2)) != 0)
|
||||||
|
return (ret);
|
||||||
|
return (c1 - c2);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
- regcomp - compile a regular expression into internal code
|
- regcomp - compile a regular expression into internal code
|
||||||
*
|
*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user