Skip to content

Commit 303e3bc

Browse files
carenascarenas
authored
make sure to use either size_t or PCRE2_SIZE correctly (#195)
It doesn't change much in practice, but helps clarify the interfaces of some functions that were either documented with the wrong type or had mismatching types between declaration and implementation.
1 parent 2f86495 commit 303e3bc

12 files changed

+29
-29
lines changed

‎doc/html/pcre2_general_context_create.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>pcre2_general_context_create man page</h1>
2020
</P>
2121
<P>
2222
<b>pcre2_general_context *pcre2_general_context_create(</b>
23-
<b> void *(*<i>private_malloc</i>)(PCRE2_SIZE, void *),</b>
23+
<b> void *(*<i>private_malloc</i>)(size_t, void *),</b>
2424
<b> void (*<i>private_free</i>)(void *, void *), void *<i>memory_data</i>);</b>
2525
</P>
2626
<br><b>

‎doc/html/pcre2_jit_stack_create.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ <h1>pcre2_jit_stack_create man page</h1>
1919
<b>#include &#60;pcre2.h&#62;</b>
2020
</P>
2121
<P>
22-
<b>pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE <i>startsize</i>,</b>
23-
<b> PCRE2_SIZE <i>maxsize</i>, pcre2_general_context *<i>gcontext</i>);</b>
22+
<b>pcre2_jit_stack *pcre2_jit_stack_create(size_t <i>startsize</i>,</b>
23+
<b> size_t <i>maxsize</i>, pcre2_general_context *<i>gcontext</i>);</b>
2424
</P>
2525
<br><b>
2626
DESCRIPTION

‎doc/html/pcre2_set_recursion_memory_management.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h1>pcre2_set_recursion_memory_management man page</h1>
2121
<P>
2222
<b>int pcre2_set_recursion_memory_management(</b>
2323
<b> pcre2_match_context *<i>mcontext</i>,</b>
24-
<b> void *(*<i>private_malloc</i>)(PCRE2_SIZE, void *),</b>
24+
<b> void *(*<i>private_malloc</i>)(size_t, void *),</b>
2525
<b> void (*<i>private_free</i>)(void *, void *), void *<i>memory_data</i>);</b>
2626
</P>
2727
<br><b>

‎doc/html/pcre2api.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ <h1>pcre2api man page</h1>
278278
<b>void pcre2_jit_free_unused_memory(pcre2_general_context *<i>gcontext</i>);</b>
279279
<br>
280280
<br>
281-
<b>pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE <i>startsize</i>,</b>
282-
<b> PCRE2_SIZE <i>maxsize</i>, pcre2_general_context *<i>gcontext</i>);</b>
281+
<b>pcre2_jit_stack *pcre2_jit_stack_create(size_t <i>startsize</i>,</b>
282+
<b> size_t <i>maxsize</i>, pcre2_general_context *<i>gcontext</i>);</b>
283283
<br>
284284
<br>
285285
<b>void pcre2_jit_stack_assign(pcre2_match_context *<i>mcontext</i>,</b>
@@ -343,7 +343,7 @@ <h1>pcre2api man page</h1>
343343
<br>
344344
<b>int pcre2_set_recursion_memory_management(</b>
345345
<b> pcre2_match_context *<i>mcontext</i>,</b>
346-
<b> void *(*<i>private_malloc</i>)(PCRE2_SIZE, void *),</b>
346+
<b> void *(*<i>private_malloc</i>)(size_t, void *),</b>
347347
<b> void (*<i>private_free</i>)(void *, void *), void *<i>memory_data</i>);</b>
348348
<br>
349349
<br>
@@ -2035,8 +2035,8 @@ <h1>pcre2api man page</h1>
20352035
<b>void pcre2_jit_free_unused_memory(pcre2_general_context *<i>gcontext</i>);</b>
20362036
<br>
20372037
<br>
2038-
<b>pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE <i>startsize</i>,</b>
2039-
<b> PCRE2_SIZE <i>maxsize</i>, pcre2_general_context *<i>gcontext</i>);</b>
2038+
<b>pcre2_jit_stack *pcre2_jit_stack_create(size_t <i>startsize</i>,</b>
2039+
<b> size_t <i>maxsize</i>, pcre2_general_context *<i>gcontext</i>);</b>
20402040
<br>
20412041
<br>
20422042
<b>void pcre2_jit_stack_assign(pcre2_match_context *<i>mcontext</i>,</b>

‎doc/pcre2_general_context_create.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PCRE2 - Perl-compatible regular expressions (revised API)
88
.PP
99
.nf
1010
.B pcre2_general_context *pcre2_general_context_create(
11-
.B " void *(*\fIprivate_malloc\fP)(PCRE2_SIZE, void *),"
11+
.B " void *(*\fIprivate_malloc\fP)(size_t, void *),"
1212
.B " void (*\fIprivate_free\fP)(void *, void *), void *\fImemory_data\fP);"
1313
.fi
1414
.

‎doc/pcre2_jit_stack_create.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ PCRE2 - Perl-compatible regular expressions (revised API)
77
.B #include <pcre2.h>
88
.PP
99
.nf
10-
.B pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE \fIstartsize\fP,
11-
.B " PCRE2_SIZE \fImaxsize\fP, pcre2_general_context *\fIgcontext\fP);"
10+
.B pcre2_jit_stack *pcre2_jit_stack_create(size_t \fIstartsize\fP,
11+
.B " size_t \fImaxsize\fP, pcre2_general_context *\fIgcontext\fP);"
1212
.fi
1313
.
1414
.SH DESCRIPTION

‎doc/pcre2_set_recursion_memory_management.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PCRE2 - Perl-compatible regular expressions (revised API)
99
.nf
1010
.B int pcre2_set_recursion_memory_management(
1111
.B " pcre2_match_context *\fImcontext\fP,"
12-
.B " void *(*\fIprivate_malloc\fP)(PCRE2_SIZE, void *),"
12+
.B " void *(*\fIprivate_malloc\fP)(size_t, void *),"
1313
.B " void (*\fIprivate_free\fP)(void *, void *), void *\fImemory_data\fP);"
1414
.fi
1515
.

‎doc/pcre2api.3

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ document for an overview of all the PCRE2 documentation.
211211
.sp
212212
.B void pcre2_jit_free_unused_memory(pcre2_general_context *\fIgcontext\fP);
213213
.sp
214-
.B pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE \fIstartsize\fP,
215-
.B " PCRE2_SIZE \fImaxsize\fP, pcre2_general_context *\fIgcontext\fP);"
214+
.B pcre2_jit_stack *pcre2_jit_stack_create(size_t \fIstartsize\fP,
215+
.B " size_t \fImaxsize\fP, pcre2_general_context *\fIgcontext\fP);"
216216
.sp
217217
.B void pcre2_jit_stack_assign(pcre2_match_context *\fImcontext\fP,
218218
.B " pcre2_jit_callback \fIcallback_function\fP, void *\fIcallback_data\fP);"
@@ -275,7 +275,7 @@ document for an overview of all the PCRE2 documentation.
275275
.sp
276276
.B int pcre2_set_recursion_memory_management(
277277
.B " pcre2_match_context *\fImcontext\fP,"
278-
.B " void *(*\fIprivate_malloc\fP)(PCRE2_SIZE, void *),"
278+
.B " void *(*\fIprivate_malloc\fP)(size_t, void *),"
279279
.B " void (*\fIprivate_free\fP)(void *, void *), void *\fImemory_data\fP);"
280280
.fi
281281
.sp
@@ -1995,8 +1995,8 @@ also set.
19951995
.sp
19961996
.B void pcre2_jit_free_unused_memory(pcre2_general_context *\fIgcontext\fP);
19971997
.sp
1998-
.B pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE \fIstartsize\fP,
1999-
.B " PCRE2_SIZE \fImaxsize\fP, pcre2_general_context *\fIgcontext\fP);"
1998+
.B pcre2_jit_stack *pcre2_jit_stack_create(size_t \fIstartsize\fP,
1999+
.B " size_t \fImaxsize\fP, pcre2_general_context *\fIgcontext\fP);"
20002000
.sp
20012001
.B void pcre2_jit_stack_assign(pcre2_match_context *\fImcontext\fP,
20022002
.B " pcre2_jit_callback \fIcallback_function\fP, void *\fIcallback_data\fP);"

‎src/pcre2.h.generic

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION pcre2_config(uint32_t, void *);
575575
PCRE2_EXP_DECL pcre2_general_context *PCRE2_CALL_CONVENTION \
576576
pcre2_general_context_copy(pcre2_general_context *); \
577577
PCRE2_EXP_DECL pcre2_general_context *PCRE2_CALL_CONVENTION \
578-
pcre2_general_context_create(void *(*)(PCRE2_SIZE, void *), \
578+
pcre2_general_context_create(void *(*)(size_t, void *), \
579579
void (*)(void *, void *), void *); \
580580
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
581581
pcre2_general_context_free(pcre2_general_context *);
@@ -628,7 +628,7 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
628628
pcre2_set_recursion_limit(pcre2_match_context *, uint32_t); \
629629
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
630630
pcre2_set_recursion_memory_management(pcre2_match_context *, \
631-
void *(*)(PCRE2_SIZE, void *), void (*)(void *, void *), void *);
631+
void *(*)(size_t, void *), void (*)(void *, void *), void *);
632632

633633
#define PCRE2_CONVERT_CONTEXT_FUNCTIONS \
634634
PCRE2_EXP_DECL pcre2_convert_context *PCRE2_CALL_CONVENTION \
@@ -771,7 +771,7 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
771771
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
772772
pcre2_jit_free_unused_memory(pcre2_general_context *); \
773773
PCRE2_EXP_DECL pcre2_jit_stack *PCRE2_CALL_CONVENTION \
774-
pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, pcre2_general_context *); \
774+
pcre2_jit_stack_create(size_t, size_t, pcre2_general_context *); \
775775
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
776776
pcre2_jit_stack_assign(pcre2_match_context *, pcre2_jit_callback, void *); \
777777
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \

‎src/pcre2.h.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION pcre2_config(uint32_t, void *);
575575
PCRE2_EXP_DECL pcre2_general_context *PCRE2_CALL_CONVENTION \
576576
pcre2_general_context_copy(pcre2_general_context *); \
577577
PCRE2_EXP_DECL pcre2_general_context *PCRE2_CALL_CONVENTION \
578-
pcre2_general_context_create(void *(*)(PCRE2_SIZE, void *), \
578+
pcre2_general_context_create(void *(*)(size_t, void *), \
579579
void (*)(void *, void *), void *); \
580580
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
581581
pcre2_general_context_free(pcre2_general_context *);
@@ -628,7 +628,7 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
628628
pcre2_set_recursion_limit(pcre2_match_context *, uint32_t); \
629629
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
630630
pcre2_set_recursion_memory_management(pcre2_match_context *, \
631-
void *(*)(PCRE2_SIZE, void *), void (*)(void *, void *), void *);
631+
void *(*)(size_t, void *), void (*)(void *, void *), void *);
632632

633633
#define PCRE2_CONVERT_CONTEXT_FUNCTIONS \
634634
PCRE2_EXP_DECL pcre2_convert_context *PCRE2_CALL_CONVENTION \
@@ -773,7 +773,7 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
773773
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
774774
pcre2_jit_free_unused_memory(pcre2_general_context *); \
775775
PCRE2_EXP_DECL pcre2_jit_stack *PCRE2_CALL_CONVENTION \
776-
pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, pcre2_general_context *); \
776+
pcre2_jit_stack_create(size_t, size_t, pcre2_general_context *); \
777777
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
778778
pcre2_jit_stack_assign(pcre2_match_context *, pcre2_jit_callback, void *); \
779779
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \

‎src/pcre2_intmodedep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ argument in 8-bit and 16-bit modes, so we need no more than a 16-bit field
610610
here.) */
611611

612612
#undef CODE_BLOCKSIZE_TYPE
613-
#define CODE_BLOCKSIZE_TYPE size_t
613+
#define CODE_BLOCKSIZE_TYPE PCRE2_SIZE
614614

615615
#undef LOOKBEHIND_MAX
616616
#define LOOKBEHIND_MAX UINT16_MAX

‎src/pcre2test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,7 +2789,7 @@ return sys_errlist[n];
27892789

27902790
/* Alternative memory functions, to test functionality. */
27912791

2792-
static void *my_malloc(PCRE2_SIZE size, void *data)
2792+
static void *my_malloc(size_t size, void *data)
27932793
{
27942794
void *block = malloc(size);
27952795
(void)data;
@@ -4331,7 +4331,7 @@ static void
43314331
show_memory_info(void)
43324332
{
43334333
uint32_t name_count, name_entry_size;
4334-
size_t size, cblock_size;
4334+
PCRE2_SIZE size, cblock_size;
43354335

43364336
/* One of the test_mode values will always be true, but to stop a compiler
43374337
warning we must initialize cblock_size. */
@@ -4355,7 +4355,7 @@ if (test_mode == PCRE32_MODE) cblock_size = sizeof(pcre2_real_code_32);
43554355
grumbling about potential overflow. */
43564356

43574357
fprintf(outfile, "Memory allocation (code space): %" SIZ_FORM "\n", size -
4358-
(size_t)name_count * (size_t)name_entry_size * (size_t)code_unit_size -
4358+
(PCRE2_SIZE)name_count * (PCRE2_SIZE)name_entry_size * (PCRE2_SIZE)code_unit_size -
43594359
cblock_size);
43604360

43614361
if (pat_patctl.jit != 0)
@@ -4374,7 +4374,7 @@ if (pat_patctl.jit != 0)
43744374
static void
43754375
show_framesize(void)
43764376
{
4377-
size_t frame_size;
4377+
PCRE2_SIZE frame_size;
43784378
(void)pattern_info(PCRE2_INFO_FRAMESIZE, &frame_size, FALSE);
43794379
fprintf(outfile, "Frame size for pcre2_match(): %" SIZ_FORM "\n", frame_size);
43804380
}

0 commit comments

Comments
 (0)