Skip to content

Commit 6aa682f

Browse files
faizshukrifaizshukri
committed
CS + WS changes
1 parent 187a0d9 commit 6aa682f

20 files changed

+286
-296
lines changed

‎ext/mysqlnd/mysqlnd.c

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND *conn TSRMLS_DC)
224224
/* {{{ mysqlnd_conn::simple_command_handle_response */
225225
static enum_func_status
226226
MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum mysqlnd_packet_type ok_packet,
227-
zend_bool silent, enum php_mysqlnd_server_command command,
228-
zend_bool ignore_upsert_status TSRMLS_DC)
227+
zend_bool silent, enum php_mysqlnd_server_command command,
228+
zend_bool ignore_upsert_status TSRMLS_DC)
229229
{
230230
enum_func_status ret;
231231

@@ -282,19 +282,17 @@ MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum
282282
if (!silent) {
283283
DBG_ERR_FMT("Error while reading %s's EOF packet", mysqlnd_command_to_text[command]);
284284
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error while reading %s's EOF packet. PID=%d",
285-
mysqlnd_command_to_text[command], getpid());
285+
mysqlnd_command_to_text[command], getpid());
286286
}
287287
} else if (0xFF == ok_response->field_count) {
288288
/* The server signalled error. Set the error */
289289
SET_CLIENT_ERROR(conn->error_info, ok_response->error_no, ok_response->sqlstate, ok_response->error);
290290
SET_ERROR_AFF_ROWS(conn);
291291
} else if (0xFE != ok_response->field_count) {
292-
SET_CLIENT_ERROR(conn->error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE,
293-
"Malformed packet");
292+
SET_CLIENT_ERROR(conn->error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
294293
if (!silent) {
295294
DBG_ERR_FMT("EOF packet expected, field count wasn't 0xFE but 0x%2X", ok_response->field_count);
296-
php_error_docref(NULL TSRMLS_CC, E_WARNING,
297-
"EOF packet expected, field count wasn't 0xFE but 0x%2X",
295+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "EOF packet expected, field count wasn't 0xFE but 0x%2X",
298296
ok_response->field_count);
299297
}
300298
} else {
@@ -305,10 +303,8 @@ MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum
305303
}
306304
default:
307305
ret = FAIL;
308-
SET_CLIENT_ERROR(conn->error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE,
309-
"Malformed packet");
310-
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Wrong response packet %d passed to the function",
311-
ok_packet);
306+
SET_CLIENT_ERROR(conn->error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
307+
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Wrong response packet %d passed to the function", ok_packet);
312308
break;
313309
}
314310
DBG_INF(ret == PASS ? "PASS":"FAIL");
@@ -543,7 +539,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND *conn,
543539
ok_packet = conn->protocol->m.get_ok_packet(conn->protocol, FALSE TSRMLS_CC);
544540

545541
if (FAIL == conn->net->m.connect(conn->net, conn->scheme, conn->scheme_len, conn->persistent, &errstr, &errcode TSRMLS_CC)) {
546-
goto err;
542+
goto err;
547543
}
548544

549545
DBG_INF_FMT("stream=%p", conn->net->stream);
@@ -594,9 +590,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND *conn,
594590
auth_packet->user = user;
595591
auth_packet->password = passwd;
596592

597-
if (conn->options.charset_name &&
598-
(charset = mysqlnd_find_charset_name(conn->options.charset_name)))
599-
{
593+
if (conn->options.charset_name && (charset = mysqlnd_find_charset_name(conn->options.charset_name))) {
600594
auth_packet->charset_no = charset->nr;
601595
} else {
602596
#if PHP_MAJOR_VERSION >= 6
@@ -721,8 +715,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND *conn,
721715
#if PHP_MAJOR_VERSION >= 6
722716
{
723717
unsigned int as_unicode = 1;
724-
conn->m->set_client_option(conn, MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE,
725-
(char *)&as_unicode TSRMLS_CC);
718+
conn->m->set_client_option(conn, MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE, (char *)&as_unicode TSRMLS_CC);
726719
DBG_INF("unicode set");
727720
}
728721
#endif

‎ext/mysqlnd/mysqlnd_block_alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz
111111
chunk->ptr = new_ptr;
112112
chunk->size = size;
113113
chunk->pool = NULL; /* now we have no pool memory */
114-
pool->refcount--;
114+
pool->refcount--;
115115
}
116116
}
117117
} else {

‎ext/mysqlnd/mysqlnd_charset.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_name(const char * const name
663663

664664
/* {{{ mysqlnd_cset_escape_quotes */
665665
PHPAPI ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const cset, char *newstr,
666-
const char *escapestr, size_t escapestr_len TSRMLS_DC)
666+
const char * escapestr, size_t escapestr_len TSRMLS_DC)
667667
{
668668
const char *newstr_s = newstr;
669669
const char *newstr_e = newstr + 2 * escapestr_len;
@@ -717,7 +717,7 @@ PHPAPI ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const cset, char
717717

718718
/* {{{ mysqlnd_cset_escape_slashes */
719719
PHPAPI ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset, char *newstr,
720-
const char *escapestr, size_t escapestr_len TSRMLS_DC)
720+
const char * escapestr, size_t escapestr_len TSRMLS_DC)
721721
{
722722
const char *newstr_s = newstr;
723723
const char *newstr_e = newstr + 2 * escapestr_len;

‎ext/mysqlnd/mysqlnd_debug.c

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,8 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self,
116116
line_buffer[6], level_buffer[7];
117117
MYSQLND_ZTS(self);
118118

119-
if (!self->stream) {
120-
if (FAIL == self->m->open(self, FALSE)) {
121-
return FAIL;
122-
}
119+
if (!self->stream && FAIL == self->m->open(self, FALSE)) {
120+
return FAIL;
123121
}
124122

125123
if (level == -1) {
@@ -188,10 +186,10 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self,
188186
pipe_buffer, type? type:"", message);
189187

190188
ret = php_stream_write(self->stream, message_line, message_line_len)? PASS:FAIL;
191-
efree(message_line);
189+
efree(message_line); /* allocated by spprintf */
192190
if (flags & MYSQLND_DEBUG_FLUSH) {
193191
self->m->close(self);
194-
self->m->open(self, TRUE);
192+
self->m->open(self, TRUE);
195193
}
196194
return ret;
197195
}
@@ -216,10 +214,8 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self,
216214
line_buffer[6], level_buffer[7];
217215
MYSQLND_ZTS(self);
218216

219-
if (!self->stream) {
220-
if (FAIL == self->m->open(self, FALSE)) {
221-
return FAIL;
222-
}
217+
if (!self->stream && FAIL == self->m->open(self, FALSE)) {
218+
return FAIL;
223219
}
224220

225221
if (level == -1) {
@@ -294,11 +290,11 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self,
294290
efree(buffer);
295291

296292
ret = php_stream_write(self->stream, message_line, message_line_len)? PASS:FAIL;
297-
efree(message_line);
293+
efree(message_line); /* allocated by spprintf */
298294

299295
if (flags & MYSQLND_DEBUG_FLUSH) {
300296
self->m->close(self);
301-
self->m->open(self, TRUE);
297+
self->m->open(self, TRUE);
302298
}
303299
return ret;
304300
}
@@ -324,7 +320,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self,
324320
while (*p) {
325321
if (*p == func_name) {
326322
zend_stack_push(&self->call_stack, "", sizeof(""));
327-
return FALSE;
323+
return FALSE;
328324
}
329325
p++;
330326
}
@@ -346,8 +342,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self,
346342

347343
/* {{{ mysqlnd_res_meta::func_leave */
348344
static enum_func_status
349-
MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int line,
350-
const char * const file)
345+
MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file)
351346
{
352347
char *func_name;
353348
if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) {
@@ -362,7 +357,7 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin
362357
if (func_name[0] == '\0') {
363358
; /* don't log that function */
364359
} else if (!zend_hash_num_elements(&self->not_filtered_functions) ||
365-
1 == zend_hash_exists(&self->not_filtered_functions, func_name, strlen(func_name) + 1))
360+
1 == zend_hash_exists(&self->not_filtered_functions, func_name, strlen(func_name) + 1))
366361
{
367362
self->m->log_va(self, line, file, zend_stack_count(&self->call_stack) - 1, NULL, "<%s", func_name);
368363
}
@@ -496,7 +491,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
496491
} else {
497492
#if 0
498493
php_error_docref(NULL TSRMLS_CC, E_WARNING,
499-
"Expected list of functions for '%c' found none", mode[i]);
494+
"Expected list of functions for '%c' found none", mode[i]);
500495
#endif
501496
}
502497
state = PARSER_WAIT_COLON;
@@ -585,7 +580,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
585580
state = PARSER_WAIT_COLON;
586581
} else if (state == PARSER_WAIT_COLON) {
587582
#if 0
588-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Colon expected, '%c' found", mode[i]);
583+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Colon expected, '%c' found", mode[i]);
589584
#endif
590585
}
591586
break;
@@ -719,7 +714,7 @@ void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D)
719714
ret = ecalloc(nmemb, REAL_SIZE(size));
720715

721716
DBG_INF_FMT("after : %lu", zend_memory_usage(FALSE TSRMLS_CC));
722-
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
717+
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
723718
if (collect_memory_statistics) {
724719
*(size_t *) ret = size;
725720
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_ECALLOC_COUNT, 1, STAT_MEM_ECALLOC_AMOUNT, size);
@@ -738,7 +733,7 @@ void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent M
738733
DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
739734

740735
ret = pecalloc(nmemb, REAL_SIZE(size), persistent);
741-
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
736+
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
742737

743738
if (collect_memory_statistics) {
744739
enum mysqlnd_collected_stats s1 = persistent? STAT_MEM_CALLOC_COUNT:STAT_MEM_ECALLOC_COUNT;
@@ -764,7 +759,7 @@ void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D)
764759

765760
ret = erealloc(REAL_PTR(ptr), REAL_SIZE(new_size));
766761

767-
DBG_INF_FMT("new_ptr=%p", ret);
762+
DBG_INF_FMT("new_ptr=%p", (char*)ret);
768763
if (collect_memory_statistics) {
769764
*(size_t *) ret = new_size;
770765
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_EREALLOC_COUNT, 1, STAT_MEM_EREALLOC_AMOUNT, new_size);
@@ -786,7 +781,7 @@ void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQL
786781

787782
ret = perealloc(REAL_PTR(ptr), REAL_SIZE(new_size), persistent);
788783

789-
DBG_INF_FMT("new_ptr=%p", ret);
784+
DBG_INF_FMT("new_ptr=%p", (char*)ret);
790785

791786
if (collect_memory_statistics) {
792787
enum mysqlnd_collected_stats s1 = persistent? STAT_MEM_REALLOC_COUNT:STAT_MEM_EREALLOC_COUNT;
@@ -859,7 +854,7 @@ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D)
859854

860855
ret = malloc(REAL_SIZE(size));
861856

862-
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
857+
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
863858
if (collect_memory_statistics) {
864859
*(size_t *) ret = size;
865860
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_MALLOC_COUNT, 1, STAT_MEM_MALLOC_AMOUNT, size);
@@ -879,7 +874,7 @@ void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D)
879874

880875
ret = calloc(nmemb, REAL_SIZE(size));
881876

882-
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
877+
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
883878
if (collect_memory_statistics) {
884879
*(size_t *) ret = size;
885880
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_CALLOC_COUNT, 1, STAT_MEM_CALLOC_AMOUNT, size);
@@ -901,7 +896,7 @@ void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D)
901896

902897
ret = realloc(REAL_PTR(ptr), REAL_SIZE(new_size));
903898

904-
DBG_INF_FMT("new_ptr=%p", ret);
899+
DBG_INF_FMT("new_ptr=%p", (char*)ret);
905900

906901
if (collect_memory_statistics) {
907902
*(size_t *) ret = new_size;

‎ext/mysqlnd/mysqlnd_enum_n_def.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,11 @@ typedef enum mysqlnd_server_option
267267

268268

269269
/*
270-
/-----> CONN_CLOSE <---------------\
271-
| ^ \
272-
| | \
270+
/-----> CONN_CLOSE <---------------\
271+
| ^ \
272+
| | \
273273
CONN_READY -> CONN_QUERY_SENT -> CONN_FETCHING_DATA
274-
^ |
274+
^ |
275275
\-------------------------------------/
276276
*/
277277
typedef enum mysqlnd_connection_state
@@ -548,15 +548,15 @@ enum php_mysqlnd_server_command
548548

549549
#define MYSQLND_DEFAULT_PREFETCH_ROWS (ulong) 1
550550

551-
#define MYSQLND_REFRESH_GRANT 1 /* Refresh grant tables */
552-
#define MYSQLND_REFRESH_LOG 2 /* Start on new log file */
553-
#define MYSQLND_REFRESH_TABLES 4 /* close all tables */
554-
#define MYSQLND_REFRESH_HOSTS 8 /* Flush host cache */
555-
#define MYSQLND_REFRESH_STATUS 16 /* Flush status variables */
556-
#define MYSQLND_REFRESH_THREADS 32 /* Flush thread cache */
557-
#define MYSQLND_REFRESH_SLAVE 64 /* Reset master info and restart slave */
558-
#define MYSQLND_REFRESH_MASTER 128 /* Remove all bin logs in the index */
559-
#define MYSQLND_REFRESH_BACKUP_LOG 0x200000L
551+
#define MYSQLND_REFRESH_GRANT 1 /* Refresh grant tables */
552+
#define MYSQLND_REFRESH_LOG 2 /* Start on new log file */
553+
#define MYSQLND_REFRESH_TABLES 4 /* close all tables */
554+
#define MYSQLND_REFRESH_HOSTS 8 /* Flush host cache */
555+
#define MYSQLND_REFRESH_STATUS 16 /* Flush status variables */
556+
#define MYSQLND_REFRESH_THREADS 32 /* Flush thread cache */
557+
#define MYSQLND_REFRESH_SLAVE 64 /* Reset master info and restart slave */
558+
#define MYSQLND_REFRESH_MASTER 128 /* Remove all bin logs in the index */
559+
#define MYSQLND_REFRESH_BACKUP_LOG 0x200000L
560560

561561
#endif /* MYSQLND_ENUM_N_DEF_H */
562562

‎ext/mysqlnd/mysqlnd_libmysql_compat.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@
122122
#define mysql_warning_count(r) mysqlnd_warning_count((r))
123123
#define mysql_eof(r) (((r)->unbuf && (r)->unbuf->eof_reached) || (r)->stored_data)
124124

125-
#define REFRESH_GRANT MYSQLND_REFRESH_GRANT
126-
#define REFRESH_LOG MYSQLND_REFRESH_LOG
127-
#define REFRESH_TABLES MYSQLND_REFRESH_TABLES
128-
#define REFRESH_HOSTS MYSQLND_REFRESH_HOSTS
129-
#define REFRESH_STATUS MYSQLND_REFRESH_STATUS
130-
#define REFRESH_THREADS MYSQLND_REFRESH_THREADS
131-
#define REFRESH_SLAVE MYSQLND_REFRESH_SLAVE
132-
#define REFRESH_MASTER MYSQLND_REFRESH_MASTER
133-
#define REFRESH_BACKUP_LOG MYSQLND_REFRESH_BACKUP_LOG
125+
#define REFRESH_GRANT MYSQLND_REFRESH_GRANT
126+
#define REFRESH_LOG MYSQLND_REFRESH_LOG
127+
#define REFRESH_TABLES MYSQLND_REFRESH_TABLES
128+
#define REFRESH_HOSTS MYSQLND_REFRESH_HOSTS
129+
#define REFRESH_STATUS MYSQLND_REFRESH_STATUS
130+
#define REFRESH_THREADS MYSQLND_REFRESH_THREADS
131+
#define REFRESH_SLAVE MYSQLND_REFRESH_SLAVE
132+
#define REFRESH_MASTER MYSQLND_REFRESH_MASTER
133+
#define REFRESH_BACKUP_LOG MYSQLND_REFRESH_BACKUP_LOG
134134

135135
#endif /* MYSQLND_LIBMYSQL_COMPAT_H */

‎ext/mysqlnd/mysqlnd_loaddata.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (c) {\
3737

3838
#define FREE_CALLBACK_ARGS(a, b, c)\
3939
if (a) {\
40-
for (i=b; i < c; i++) {\
40+
for (i = b; i < c; i++) {\
4141
zval_ptr_dtor(a[i]);\
4242
mnd_efree(a[i]);\
4343
}\
@@ -48,8 +48,8 @@ if (a) {\
4848
static
4949
int mysqlnd_local_infile_init(void **ptr, char *filename, void **userdata TSRMLS_DC)
5050
{
51-
MYSQLND_INFILE_INFO *info;
52-
php_stream_context *context = NULL;
51+
MYSQLND_INFILE_INFO *info;
52+
php_stream_context *context = NULL;
5353

5454
DBG_ENTER("mysqlnd_local_infile_init");
5555

@@ -85,7 +85,7 @@ int mysqlnd_local_infile_read(void *ptr, char *buf, unsigned int buf_len TSRMLS_
8585
MYSQLND_INFILE_INFO *info = (MYSQLND_INFILE_INFO *)ptr;
8686
int count;
8787

88-
DBG_ENTER("mysqlnd_local_infile_read");
88+
DBG_ENTER("mysqlnd_local_infile_read");
8989

9090
count = (int)php_stream_read(info->fd, buf, buf_len);
9191

@@ -171,7 +171,7 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
171171
char *buf;
172172
char empty_packet[MYSQLND_HEADER_SIZE];
173173
enum_func_status result = FAIL;
174-
unsigned int buflen = 4096;
174+
unsigned int buflen = 4096;
175175
void *info = NULL;
176176
int bufsize;
177177
size_t ret;
@@ -199,16 +199,14 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
199199
/* error occured */
200200
strcpy(conn->error_info.sqlstate, UNKNOWN_SQLSTATE);
201201
conn->error_info.error_no =
202-
infile.local_infile_error(info, conn->error_info.error,
203-
sizeof(conn->error_info.error) TSRMLS_CC);
202+
infile.local_infile_error(info, conn->error_info.error, sizeof(conn->error_info.error) TSRMLS_CC);
204203
/* write empty packet to server */
205204
ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC);
206205
goto infile_error;
207206
}
208207

209208
/* read data */
210-
while ((bufsize = infile.local_infile_read (info, buf + MYSQLND_HEADER_SIZE,
211-
buflen - MYSQLND_HEADER_SIZE TSRMLS_CC)) > 0) {
209+
while ((bufsize = infile.local_infile_read (info, buf + MYSQLND_HEADER_SIZE, buflen - MYSQLND_HEADER_SIZE TSRMLS_CC)) > 0) {
212210
if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) < 0) {
213211
DBG_ERR_FMT("Error during read : %d %s %s", CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
214212
SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
@@ -227,8 +225,8 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
227225
*is_warning = TRUE;
228226
DBG_ERR_FMT("Bufsize < 0, warning, %d %s %s", CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
229227
strcpy(conn->error_info.sqlstate, UNKNOWN_SQLSTATE);
230-
conn->error_info.error_no = infile.local_infile_error(info, conn->error_info.error,
231-
sizeof(conn->error_info.error) TSRMLS_CC);
228+
conn->error_info.error_no =
229+
infile.local_infile_error(info, conn->error_info.error, sizeof(conn->error_info.error) TSRMLS_CC);
232230
goto infile_error;
233231
}
234232

0 commit comments

Comments
 (0)