diff options
| author | Paul Eggert | 2017-02-18 18:16:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-02-18 18:17:03 -0800 |
| commit | b2a83eed23d540b4b0ab9e0bf5605821011bfd7d (patch) | |
| tree | 20545c597c19d213252bcdba7076a807ec633867 /src/regex.c | |
| parent | 7f89c208bf4bb256c67cc59351f4171c7a6b63aa (diff) | |
| download | emacs-b2a83eed23d540b4b0ab9e0bf5605821011bfd7d.tar.gz emacs-b2a83eed23d540b4b0ab9e0bf5605821011bfd7d.zip | |
Use 'char *FOO' instead of 'char* FOO'
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/regex.c b/src/regex.c index 796f868d1c2..8e38a920cdb 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -1421,7 +1421,7 @@ do { \ | |||
| 1421 | { \ | 1421 | { \ |
| 1422 | /* It's a counter. */ \ | 1422 | /* It's a counter. */ \ |
| 1423 | /* Here, we discard `const', making re_match non-reentrant. */ \ | 1423 | /* Here, we discard `const', making re_match non-reentrant. */ \ |
| 1424 | unsigned char *ptr = (unsigned char*) POP_FAILURE_POINTER (); \ | 1424 | unsigned char *ptr = (unsigned char *) POP_FAILURE_POINTER (); \ |
| 1425 | pfreg = POP_FAILURE_INT (); \ | 1425 | pfreg = POP_FAILURE_INT (); \ |
| 1426 | STORE_NUMBER (ptr, pfreg); \ | 1426 | STORE_NUMBER (ptr, pfreg); \ |
| 1427 | DEBUG_PRINT (" Pop counter %p = %ld\n", ptr, pfreg); \ | 1427 | DEBUG_PRINT (" Pop counter %p = %ld\n", ptr, pfreg); \ |
| @@ -4220,8 +4220,8 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1, size_t size1, | |||
| 4220 | struct re_registers *regs, ssize_t stop) | 4220 | struct re_registers *regs, ssize_t stop) |
| 4221 | { | 4221 | { |
| 4222 | regoff_t val; | 4222 | regoff_t val; |
| 4223 | re_char *string1 = (re_char*) str1; | 4223 | re_char *string1 = (re_char *) str1; |
| 4224 | re_char *string2 = (re_char*) str2; | 4224 | re_char *string2 = (re_char *) str2; |
| 4225 | register char *fastmap = bufp->fastmap; | 4225 | register char *fastmap = bufp->fastmap; |
| 4226 | register RE_TRANSLATE_TYPE translate = bufp->translate; | 4226 | register RE_TRANSLATE_TYPE translate = bufp->translate; |
| 4227 | size_t total_size = size1 + size2; | 4227 | size_t total_size = size1 + size2; |
| @@ -4887,7 +4887,7 @@ regoff_t | |||
| 4887 | re_match (struct re_pattern_buffer *bufp, const char *string, | 4887 | re_match (struct re_pattern_buffer *bufp, const char *string, |
| 4888 | size_t size, ssize_t pos, struct re_registers *regs) | 4888 | size_t size, ssize_t pos, struct re_registers *regs) |
| 4889 | { | 4889 | { |
| 4890 | regoff_t result = re_match_2_internal (bufp, NULL, 0, (re_char*) string, | 4890 | regoff_t result = re_match_2_internal (bufp, NULL, 0, (re_char *) string, |
| 4891 | size, pos, regs, size); | 4891 | size, pos, regs, size); |
| 4892 | return result; | 4892 | return result; |
| 4893 | } | 4893 | } |
| @@ -4921,8 +4921,8 @@ re_match_2 (struct re_pattern_buffer *bufp, const char *string1, | |||
| 4921 | SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); | 4921 | SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); |
| 4922 | #endif | 4922 | #endif |
| 4923 | 4923 | ||
| 4924 | result = re_match_2_internal (bufp, (re_char*) string1, size1, | 4924 | result = re_match_2_internal (bufp, (re_char *) string1, size1, |
| 4925 | (re_char*) string2, size2, | 4925 | (re_char *) string2, size2, |
| 4926 | pos, regs, stop); | 4926 | pos, regs, stop); |
| 4927 | return result; | 4927 | return result; |
| 4928 | } | 4928 | } |
| @@ -5785,8 +5785,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, | |||
| 5785 | { | 5785 | { |
| 5786 | re_char *p1 = p; /* Next operation. */ | 5786 | re_char *p1 = p; /* Next operation. */ |
| 5787 | /* Here, we discard `const', making re_match non-reentrant. */ | 5787 | /* Here, we discard `const', making re_match non-reentrant. */ |
| 5788 | unsigned char *p2 = (unsigned char*) p + mcnt; /* Jump dest. */ | 5788 | unsigned char *p2 = (unsigned char *) p + mcnt; /* Jump dest. */ |
| 5789 | unsigned char *p3 = (unsigned char*) p - 3; /* opcode location. */ | 5789 | unsigned char *p3 = (unsigned char *) p - 3; /* opcode location. */ |
| 5790 | 5790 | ||
| 5791 | p -= 3; /* Reset so that we will re-execute the | 5791 | p -= 3; /* Reset so that we will re-execute the |
| 5792 | instruction once it's been changed. */ | 5792 | instruction once it's been changed. */ |
| @@ -5837,7 +5837,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, | |||
| 5837 | if (mcnt != 0) | 5837 | if (mcnt != 0) |
| 5838 | { | 5838 | { |
| 5839 | /* Here, we discard `const', making re_match non-reentrant. */ | 5839 | /* Here, we discard `const', making re_match non-reentrant. */ |
| 5840 | unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ | 5840 | unsigned char *p2 = (unsigned char *) p + 2; /* counter loc. */ |
| 5841 | mcnt--; | 5841 | mcnt--; |
| 5842 | p += 4; | 5842 | p += 4; |
| 5843 | PUSH_NUMBER (p2, mcnt); | 5843 | PUSH_NUMBER (p2, mcnt); |
| @@ -5856,7 +5856,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, | |||
| 5856 | if (mcnt != 0) | 5856 | if (mcnt != 0) |
| 5857 | { | 5857 | { |
| 5858 | /* Here, we discard `const', making re_match non-reentrant. */ | 5858 | /* Here, we discard `const', making re_match non-reentrant. */ |
| 5859 | unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ | 5859 | unsigned char *p2 = (unsigned char *) p + 2; /* counter loc. */ |
| 5860 | mcnt--; | 5860 | mcnt--; |
| 5861 | PUSH_NUMBER (p2, mcnt); | 5861 | PUSH_NUMBER (p2, mcnt); |
| 5862 | goto unconditional_jump; | 5862 | goto unconditional_jump; |
| @@ -5873,7 +5873,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, | |||
| 5873 | 5873 | ||
| 5874 | EXTRACT_NUMBER_AND_INCR (mcnt, p); | 5874 | EXTRACT_NUMBER_AND_INCR (mcnt, p); |
| 5875 | /* Here, we discard `const', making re_match non-reentrant. */ | 5875 | /* Here, we discard `const', making re_match non-reentrant. */ |
| 5876 | p2 = (unsigned char*) p + mcnt; | 5876 | p2 = (unsigned char *) p + mcnt; |
| 5877 | /* Signedness doesn't matter since we only copy MCNT's bits. */ | 5877 | /* Signedness doesn't matter since we only copy MCNT's bits. */ |
| 5878 | EXTRACT_NUMBER_AND_INCR (mcnt, p); | 5878 | EXTRACT_NUMBER_AND_INCR (mcnt, p); |
| 5879 | DEBUG_PRINT (" Setting %p to %d.\n", p2, mcnt); | 5879 | DEBUG_PRINT (" Setting %p to %d.\n", p2, mcnt); |
| @@ -6283,7 +6283,7 @@ re_compile_pattern (const char *pattern, size_t length, | |||
| 6283 | setting no_sub. */ | 6283 | setting no_sub. */ |
| 6284 | bufp->no_sub = 0; | 6284 | bufp->no_sub = 0; |
| 6285 | 6285 | ||
| 6286 | ret = regex_compile ((re_char*) pattern, length, | 6286 | ret = regex_compile ((re_char *) pattern, length, |
| 6287 | #ifdef emacs | 6287 | #ifdef emacs |
| 6288 | posix_backtracking, | 6288 | posix_backtracking, |
| 6289 | whitespace_regexp, | 6289 | whitespace_regexp, |
| @@ -6446,7 +6446,7 @@ regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, | |||
| 6446 | 6446 | ||
| 6447 | /* POSIX says a null character in the pattern terminates it, so we | 6447 | /* POSIX says a null character in the pattern terminates it, so we |
| 6448 | can use strlen here in compiling the pattern. */ | 6448 | can use strlen here in compiling the pattern. */ |
| 6449 | ret = regex_compile ((re_char*) pattern, strlen (pattern), syntax, preg); | 6449 | ret = regex_compile ((re_char *) pattern, strlen (pattern), syntax, preg); |
| 6450 | 6450 | ||
| 6451 | /* POSIX doesn't distinguish between an unmatched open-group and an | 6451 | /* POSIX doesn't distinguish between an unmatched open-group and an |
| 6452 | unmatched close-group: both are REG_EPAREN. */ | 6452 | unmatched close-group: both are REG_EPAREN. */ |