diff options
Diffstat (limited to 'src/regexp.c')
| -rw-r--r-- | src/regexp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/regexp.c b/src/regexp.c index a5d7a13a4..7f5e265eb 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -695,9 +695,9 @@ static void skipchr_keepstart(void); static int peekchr(void); static void skipchr(void); static void ungetchr(void); -static int gethexchrs(int maxinputlen); -static int getoctchrs(void); -static int getdecchrs(void); +static long gethexchrs(int maxinputlen); +static long getoctchrs(void); +static long getdecchrs(void); static int coll_get_char(void); static void regcomp_start(char_u *expr, int flags); static char_u *reg(int, int *); @@ -1837,7 +1837,7 @@ regpiece(int *flagp) case Magic('@'): { int lop = END; - int nr; + long nr; nr = getdecchrs(); switch (no_Magic(getchr())) @@ -2278,7 +2278,7 @@ regatom(int *flagp) case 'u': /* %uabcd hex 4 */ case 'U': /* %U1234abcd hex 8 */ { - int i; + long i; switch (c) { @@ -3274,10 +3274,10 @@ ungetchr(void) * The parameter controls the maximum number of input characters. This will be * 2 when reading a \%x20 sequence and 4 when reading a \%u20AC sequence. */ - static int + static long gethexchrs(int maxinputlen) { - int nr = 0; + long_u nr = 0; int c; int i; @@ -3293,17 +3293,17 @@ gethexchrs(int maxinputlen) if (i == 0) return -1; - return nr; + return (long)nr; } /* * Get and return the value of the decimal string immediately after the * current position. Return -1 for invalid. Consumes all digits. */ - static int + static long getdecchrs(void) { - int nr = 0; + long_u nr = 0; int c; int i; @@ -3320,7 +3320,7 @@ getdecchrs(void) if (i == 0) return -1; - return nr; + return (long)nr; } /* @@ -3331,10 +3331,10 @@ getdecchrs(void) * blahblah\%o210asdf * before-^ ^-after */ - static int + static long getoctchrs(void) { - int nr = 0; + long_u nr = 0; int c; int i; @@ -3350,7 +3350,7 @@ getoctchrs(void) if (i == 0) return -1; - return nr; + return (long)nr; } /* @@ -3360,7 +3360,7 @@ getoctchrs(void) static int coll_get_char(void) { - int nr = -1; + long nr = -1; switch (*regparse++) { |