Skip to content

Commit 82de444

Browse files
faizshukrifaizshukri
committed
rename parameter name - should not shadow the global symbol alloca
1 parent eb2908c commit 82de444

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎ext/mysqlnd/mysqlnd_wireprotocol.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ php_mysqlnd_greet_read(void *_packet, MYSQLND *conn TSRMLS_DC)
391391

392392
/* {{{ php_mysqlnd_greet_free_mem */
393393
static
394-
void php_mysqlnd_greet_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
394+
void php_mysqlnd_greet_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
395395
{
396396
MYSQLND_PACKET_GREET *p= (MYSQLND_PACKET_GREET *) _packet;
397397
if (p->server_version) {
398398
efree(p->server_version);
399399
p->server_version = NULL;
400400
}
401-
if (!alloca) {
401+
if (!stack_allocation) {
402402
mnd_pefree(p, p->header.persistent);
403403
}
404404
}
@@ -508,9 +508,9 @@ size_t php_mysqlnd_auth_write(void *_packet, MYSQLND * conn TSRMLS_DC)
508508

509509
/* {{{ php_mysqlnd_auth_free_mem */
510510
static
511-
void php_mysqlnd_auth_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
511+
void php_mysqlnd_auth_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
512512
{
513-
if (!alloca) {
513+
if (!stack_allocation) {
514514
MYSQLND_PACKET_AUTH * p = (MYSQLND_PACKET_AUTH *) _packet;
515515
mnd_pefree(p, p->header.persistent);
516516
}
@@ -591,14 +591,14 @@ php_mysqlnd_ok_read(void *_packet, MYSQLND *conn TSRMLS_DC)
591591

592592
/* {{{ php_mysqlnd_ok_free_mem */
593593
static void
594-
php_mysqlnd_ok_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
594+
php_mysqlnd_ok_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
595595
{
596596
MYSQLND_PACKET_OK *p= (MYSQLND_PACKET_OK *) _packet;
597597
if (p->message) {
598598
mnd_efree(p->message);
599599
p->message = NULL;
600600
}
601-
if (!alloca) {
601+
if (!stack_allocation) {
602602
mnd_pefree(p, p->header.persistent);
603603
}
604604
}
@@ -674,9 +674,9 @@ php_mysqlnd_eof_read(void *_packet, MYSQLND *conn TSRMLS_DC)
674674

675675
/* {{{ php_mysqlnd_eof_free_mem */
676676
static
677-
void php_mysqlnd_eof_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
677+
void php_mysqlnd_eof_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
678678
{
679-
if (!alloca) {
679+
if (!stack_allocation) {
680680
mnd_pefree(_packet, ((MYSQLND_PACKET_EOF *)_packet)->header.persistent);
681681
}
682682
}
@@ -748,9 +748,9 @@ size_t php_mysqlnd_cmd_write(void *_packet, MYSQLND *conn TSRMLS_DC)
748748

749749
/* {{{ php_mysqlnd_cmd_free_mem */
750750
static
751-
void php_mysqlnd_cmd_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
751+
void php_mysqlnd_cmd_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
752752
{
753-
if (!alloca) {
753+
if (!stack_allocation) {
754754
MYSQLND_PACKET_COMMAND * p = (MYSQLND_PACKET_COMMAND *) _packet;
755755
mnd_pefree(p, p->header.persistent);
756756
}
@@ -864,15 +864,15 @@ php_mysqlnd_rset_header_read(void *_packet, MYSQLND *conn TSRMLS_DC)
864864

865865
/* {{{ php_mysqlnd_rset_header_free_mem */
866866
static
867-
void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
867+
void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
868868
{
869869
MYSQLND_PACKET_RSET_HEADER *p= (MYSQLND_PACKET_RSET_HEADER *) _packet;
870870
DBG_ENTER("php_mysqlnd_rset_header_free_mem");
871871
if (p->info_or_local_file) {
872872
mnd_efree(p->info_or_local_file);
873873
p->info_or_local_file = NULL;
874874
}
875-
if (!alloca) {
875+
if (!stack_allocation) {
876876
mnd_pefree(p, p->header.persistent);
877877
}
878878
DBG_VOID_RETURN;
@@ -1091,11 +1091,11 @@ php_mysqlnd_rset_field_read(void *_packet, MYSQLND *conn TSRMLS_DC)
10911091

10921092
/* {{{ php_mysqlnd_rset_field_free_mem */
10931093
static
1094-
void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
1094+
void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
10951095
{
10961096
MYSQLND_PACKET_RES_FIELD *p= (MYSQLND_PACKET_RES_FIELD *) _packet;
10971097
/* p->metadata was passed to us as temporal buffer */
1098-
if (!alloca) {
1098+
if (!stack_allocation) {
10991099
mnd_pefree(p, p->header.persistent);
11001100
}
11011101
}
@@ -1614,7 +1614,7 @@ php_mysqlnd_rowp_read(void *_packet, MYSQLND *conn TSRMLS_DC)
16141614

16151615
/* {{{ php_mysqlnd_rowp_free_mem */
16161616
static void
1617-
php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
1617+
php_mysqlnd_rowp_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
16181618
{
16191619
MYSQLND_PACKET_ROW *p;
16201620

@@ -1624,15 +1624,15 @@ php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
16241624
p->row_buffer->free_chunk(p->row_buffer TSRMLS_CC);
16251625
p->row_buffer = NULL;
16261626
}
1627-
DBG_INF_FMT("alloca=%u persistent=%u", (int)alloca, (int)p->header.persistent);
1627+
DBG_INF_FMT("stack_allocation=%u persistent=%u", (int)stack_allocation, (int)p->header.persistent);
16281628
/*
16291629
Don't free packet->fields :
16301630
- normal queries -> store_result() | fetch_row_unbuffered() will transfer
16311631
the ownership and NULL it.
16321632
- PS will pass in it the bound variables, we have to use them! and of course
16331633
not free the array. As it is passed to us, we should not clean it ourselves.
16341634
*/
1635-
if (!alloca) {
1635+
if (!stack_allocation) {
16361636
mnd_pefree(p, p->header.persistent);
16371637
}
16381638
DBG_VOID_RETURN;
@@ -1664,14 +1664,14 @@ php_mysqlnd_stats_read(void *_packet, MYSQLND *conn TSRMLS_DC)
16641664

16651665
/* {{{ php_mysqlnd_stats_free_mem */
16661666
static
1667-
void php_mysqlnd_stats_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
1667+
void php_mysqlnd_stats_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
16681668
{
16691669
MYSQLND_PACKET_STATS *p= (MYSQLND_PACKET_STATS *) _packet;
16701670
if (p->message) {
16711671
mnd_efree(p->message);
16721672
p->message = NULL;
16731673
}
1674-
if (!alloca) {
1674+
if (!stack_allocation) {
16751675
mnd_pefree(p, p->header.persistent);
16761676
}
16771677
}
@@ -1760,10 +1760,10 @@ php_mysqlnd_prepare_read(void *_packet, MYSQLND *conn TSRMLS_DC)
17601760

17611761
/* {{{ php_mysqlnd_prepare_free_mem */
17621762
static void
1763-
php_mysqlnd_prepare_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
1763+
php_mysqlnd_prepare_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
17641764
{
17651765
MYSQLND_PACKET_PREPARE_RESPONSE *p= (MYSQLND_PACKET_PREPARE_RESPONSE *) _packet;
1766-
if (!alloca) {
1766+
if (!stack_allocation) {
17671767
mnd_pefree(p, p->header.persistent);
17681768
}
17691769
}
@@ -1823,9 +1823,9 @@ php_mysqlnd_chg_user_read(void *_packet, MYSQLND *conn TSRMLS_DC)
18231823

18241824
/* {{{ php_mysqlnd_chg_user_free_mem */
18251825
static void
1826-
php_mysqlnd_chg_user_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
1826+
php_mysqlnd_chg_user_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
18271827
{
1828-
if (!alloca) {
1828+
if (!stack_allocation) {
18291829
mnd_pefree(_packet, ((MYSQLND_PACKET_CHG_USER_RESPONSE *)_packet)->header.persistent);
18301830
}
18311831
}

‎ext/mysqlnd/mysqlnd_wireprotocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ typedef struct st_mysqlnd_packet_methods {
5353
size_t struct_size;
5454
enum_func_status (*read_from_net)(void *packet, MYSQLND *conn TSRMLS_DC);
5555
size_t (*write_to_net)(void *packet, MYSQLND *conn TSRMLS_DC);
56-
void (*free_mem)(void *packet, zend_bool alloca TSRMLS_DC);
56+
void (*free_mem)(void *packet, zend_bool stack_allocation TSRMLS_DC);
5757
} mysqlnd_packet_methods;
5858

5959

0 commit comments

Comments
 (0)