diff options
| author | Martin Liska <mliska@suse.cz> | 2022-05-10 16:00:53 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-05-10 16:04:30 +0200 |
| commit | 50b009c5daef92bc60fc26fcc4c495e117667387 (patch) | |
| tree | bb5537637562b9fa5e5b35be905f7b8faac0c94c /libiberty/regex.c | |
| parent | 9ddd44b58649d1d1e932c1e95dc00d654733c1fc (diff) | |
| download | gcc-50b009c5daef92bc60fc26fcc4c495e117667387.zip gcc-50b009c5daef92bc60fc26fcc4c495e117667387.tar.gz gcc-50b009c5daef92bc60fc26fcc4c495e117667387.tar.bz2 | |
libiberty: stop using PTR macro
include/ChangeLog:
* hashtab.h (HTAB_EMPTY_ENTRY): Use void * instead PTR.
(HTAB_DELETED_ENTRY): Likewise.
libiberty/ChangeLog:
* alloca.c (C_alloca): Use void * instead PTR.
* calloc.c (malloc): Likewise.
(bzero): Likewise.
(calloc): Likewise.
* hashtab.c (find_empty_slot_for_expand): Likewise.
(eq_pointer): Likewise.
(htab_create_alloc_ex): Likewise.
(htab_create_typed_alloc): Likewise.
(htab_set_functions_ex): Likewise.
(htab_delete): Likewise.
(htab_empty): Likewise.
(htab_expand): Likewise.
(htab_find_with_hash): Likewise.
(htab_find): Likewise.
(htab_find_slot_with_hash): Likewise.
(htab_find_slot): Likewise.
(htab_remove_elt): Likewise.
(htab_remove_elt_with_hash): Likewise.
(htab_clear_slot): Likewise.
(htab_traverse_noresize): Likewise.
(htab_traverse): Likewise.
(htab_hash_string): Likewise.
(iterative_hash): Likewise.
(hash_pointer): Likewise.
* memchr.c (memchr): Likewise.
* memcmp.c (memcmp): Likewise.
* memcpy.c (memcpy): Likewise.
* memmove.c (memmove): Likewise.
* mempcpy.c (memcpy): Likewise.
(mempcpy): Likewise.
* memset.c (memset): Likewise.
* objalloc.c (malloc): Likewise.
(free): Likewise.
(objalloc_create): Likewise.
(_objalloc_alloc): Likewise.
(objalloc_free_block): Likewise.
* random.c (PTR): Likewise.
(void): Likewise.
(initstate): Likewise.
(setstate): Likewise.
* regex.c: Likewise.
* spaces.c (malloc): Likewise.
(free): Likewise.
* stpcpy.c (memcpy): Likewise.
* strdup.c (malloc): Likewise.
(memcpy): Likewise.
* strerror.c (malloc): Likewise.
(memset): Likewise.
* strndup.c (malloc): Likewise.
(memcpy): Likewise.
* strsignal.c (malloc): Likewise.
(memset): Likewise.
* vasprintf.c (malloc): Likewise.
* vprintf-support.c: Likewise.
* xatexit.c (malloc): Likewise.
* xmalloc.c (xmalloc): Likewise.
(xcalloc): Likewise.
(xrealloc): Likewise.
* xmemdup.c (xmemdup): Likewise.
Diffstat (limited to 'libiberty/regex.c')
| -rw-r--r-- | libiberty/regex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libiberty/regex.c b/libiberty/regex.c index 84af527..c1738c9 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -384,8 +384,8 @@ typedef unsigned long int uintptr_t; # endif /* not using relocating allocator */ -/* True if `size1' is non-NULL and PTR is pointing anywhere inside - `string1' or just past its end. This works if PTR is NULL, which is +/* True if `size1' is non-NULL and void *is pointing anywhere inside + `string1' or just past its end. This works if void *is NULL, which is a good thing. */ # define FIRST_STRING_P(ptr) \ (size1 && string1 <= (ptr) && (ptr) <= string1 + size1) @@ -5256,7 +5256,7 @@ PREFIX(re_search_2) (struct re_pattern_buffer *bufp, const char *string1, } #ifdef WCHAR -/* This converts PTR, a pointer into one of the search wchar_t strings +/* This converts void *, a pointer into one of the search wchar_t strings `string1' and `string2' into an multibyte string offset from the beginning of that string. We use mbs_offset to optimize. See convert_mbs_to_wcs. */ @@ -5266,7 +5266,7 @@ PREFIX(re_search_2) (struct re_pattern_buffer *bufp, const char *string1, : ((regoff_t)((mbs_offset2 != NULL? mbs_offset2[(ptr)-string2] : 0) \ + csize1))) #else /* BYTE */ -/* This converts PTR, a pointer into one of the search strings `string1' +/* This converts void *, a pointer into one of the search strings `string1' and `string2' into an offset from the beginning of that string. */ # define POINTER_TO_OFFSET(ptr) \ (FIRST_STRING_P (ptr) \ |