Skip to content

Commit b80767e

Browse files
nikicnikic
committed
Remove MYSQLND_SZ_T_SPEC
In favor of %zu, which msvc has supported for quite a while already.
1 parent 8f55556 commit b80767e

File tree

5 files changed

+26
-28
lines changed

5 files changed

+26
-28
lines changed

‎ext/mysqlnd/mysqlnd_portability.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ This file is public domain and comes with NO WARRANTY of any kind */
4747
/* Go around some bugs in different OS and compilers */
4848

4949
#ifdef PHP_WIN32
50-
#define MYSQLND_SZ_T_SPEC "%Id"
5150
#ifndef L64
5251
#define L64(x) x##i64
5352
#endif
5453
#else
5554

56-
#define MYSQLND_SZ_T_SPEC "%zd"
5755
#ifndef L64
5856
#define L64(x) x##LL
5957
#endif

‎ext/mysqlnd/mysqlnd_protocol_frame_codec.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static ssize_t write_compressed_packet(
7070

7171
int3store(compress_buf, payload_size);
7272
int1store(compress_buf + 3, pfc->data->compressed_envelope_packet_no);
73-
DBG_INF_FMT("writing "MYSQLND_SZ_T_SPEC" bytes to the network", payload_size + MYSQLND_HEADER_SIZE + COMPRESSED_HEADER_SIZE);
73+
DBG_INF_FMT("writing %zu bytes to the network", payload_size + MYSQLND_HEADER_SIZE + COMPRESSED_HEADER_SIZE);
7474

7575
ssize_t bytes_sent = vio->data->m.network_write(vio, compress_buf, payload_size + MYSQLND_HEADER_SIZE + COMPRESSED_HEADER_SIZE, conn_stats, error_info);
7676
pfc->data->compressed_envelope_packet_no++;
@@ -125,11 +125,11 @@ MYSQLND_METHOD(mysqlnd_pfc, send)(MYSQLND_PFC * const pfc, MYSQLND_VIO * const v
125125
ssize_t bytes_sent;
126126

127127
DBG_ENTER("mysqlnd_pfc::send");
128-
DBG_INF_FMT("count=" MYSQLND_SZ_T_SPEC " compression=%u", count, pfc->data->compressed);
128+
DBG_INF_FMT("count=%zu compression=%u", count, pfc->data->compressed);
129129

130130
if (pfc->data->compressed == TRUE) {
131131
size_t comp_buf_size = MYSQLND_HEADER_SIZE + COMPRESSED_HEADER_SIZE + MYSQLND_HEADER_SIZE + MIN(left, MYSQLND_MAX_PACKET_SIZE);
132-
DBG_INF_FMT("compress_buf_size="MYSQLND_SZ_T_SPEC, comp_buf_size);
132+
DBG_INF_FMT("compress_buf_size=%zu", comp_buf_size);
133133
compress_buf = mnd_emalloc(comp_buf_size);
134134
}
135135

@@ -187,7 +187,7 @@ MYSQLND_METHOD(mysqlnd_pfc, send)(MYSQLND_PFC * const pfc, MYSQLND_VIO * const v
187187
*/
188188
} while (bytes_sent > 0 && (left > 0 || to_be_sent == MYSQLND_MAX_PACKET_SIZE));
189189

190-
DBG_INF_FMT("packet_size="MYSQLND_SZ_T_SPEC" packet_no=%u", left, pfc->data->packet_no);
190+
DBG_INF_FMT("packet_size=%zu packet_no=%u", left, pfc->data->packet_no);
191191

192192
MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats,
193193
STAT_BYTES_SENT, count + packets_sent * MYSQLND_HEADER_SIZE,
@@ -270,7 +270,7 @@ MYSQLND_METHOD(mysqlnd_pfc, decode)(zend_uchar * uncompressed_data, const size_t
270270
DBG_ENTER("mysqlnd_pfc::decode");
271271
error = uncompress(uncompressed_data, &tmp_complen, compressed_data, compressed_data_len);
272272

273-
DBG_INF_FMT("compressed data: decomp_len=%lu compressed_size="MYSQLND_SZ_T_SPEC, tmp_complen, compressed_data_len);
273+
DBG_INF_FMT("compressed data: decomp_len=%lu compressed_size=%zu", tmp_complen, compressed_data_len);
274274
if (error != Z_OK) {
275275
DBG_INF_FMT("decompression NOT successful. error=%d Z_OK=%d Z_BUF_ERROR=%d Z_MEM_ERROR=%d", error, Z_OK, Z_BUF_ERROR, Z_MEM_ERROR);
276276
}
@@ -323,13 +323,13 @@ MYSQLND_METHOD(mysqlnd_pfc, receive)(MYSQLND_PFC * const pfc, MYSQLND_VIO * cons
323323
if (pfc->data->compressed) {
324324
if (pfc->data->uncompressed_data) {
325325
size_t to_read_from_buffer = MIN(pfc->data->uncompressed_data->bytes_left(pfc->data->uncompressed_data), to_read);
326-
DBG_INF_FMT("reading "MYSQLND_SZ_T_SPEC" from uncompressed_data buffer", to_read_from_buffer);
326+
DBG_INF_FMT("reading %zu from uncompressed_data buffer", to_read_from_buffer);
327327
if (to_read_from_buffer) {
328328
pfc->data->uncompressed_data->read(pfc->data->uncompressed_data, to_read_from_buffer, (zend_uchar *) p);
329329
p += to_read_from_buffer;
330330
to_read -= to_read_from_buffer;
331331
}
332-
DBG_INF_FMT("left "MYSQLND_SZ_T_SPEC" to read", to_read);
332+
DBG_INF_FMT("left %zu to read", to_read);
333333
if (TRUE == pfc->data->uncompressed_data->is_empty(pfc->data->uncompressed_data)) {
334334
/* Everything was consumed. This should never happen here, but for security */
335335
pfc->data->uncompressed_data->free_buffer(&pfc->data->uncompressed_data);
@@ -346,10 +346,10 @@ MYSQLND_METHOD(mysqlnd_pfc, receive)(MYSQLND_PFC * const pfc, MYSQLND_VIO * cons
346346
net_payload_size = uint3korr(net_header);
347347
packet_no = uint1korr(net_header + 3);
348348
if (pfc->data->compressed_envelope_packet_no != packet_no) {
349-
DBG_ERR_FMT("Transport level: packets out of order. Expected %u received %u. Packet size="MYSQLND_SZ_T_SPEC,
349+
DBG_ERR_FMT("Transport level: packets out of order. Expected %u received %u. Packet size=%zu",
350350
pfc->data->compressed_envelope_packet_no, packet_no, net_payload_size);
351351

352-
php_error(E_WARNING, "Packets out of order. Expected %u received %u. Packet size="MYSQLND_SZ_T_SPEC,
352+
php_error(E_WARNING, "Packets out of order. Expected %u received %u. Packet size=%zu",
353353
pfc->data->compressed_envelope_packet_no, packet_no, net_payload_size);
354354
DBG_RETURN(FAIL);
355355
}
@@ -400,7 +400,7 @@ MYSQLND_METHOD(mysqlnd_pfc, set_client_option)(MYSQLND_PFC * const pfc, enum_mys
400400
DBG_RETURN(FAIL);
401401
}
402402
pfc->cmd_buffer.length = *(unsigned int*) value;
403-
DBG_INF_FMT("new_length="MYSQLND_SZ_T_SPEC, pfc->cmd_buffer.length);
403+
DBG_INF_FMT("new_length=%zu", pfc->cmd_buffer.length);
404404
if (!pfc->cmd_buffer.buffer) {
405405
pfc->cmd_buffer.buffer = mnd_pemalloc(pfc->cmd_buffer.length, pfc->persistent);
406406
} else {

‎ext/mysqlnd/mysqlnd_ps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned in
10961096
php_error_docref(NULL, E_WARNING, "There was an error "
10971097
"while sending long data. Probably max_allowed_packet_size "
10981098
"is smaller than the data. You have to increase it or send "
1099-
"smaller chunks of data. Answer was "MYSQLND_SZ_T_SPEC" bytes long.", packet_len);
1099+
"smaller chunks of data. Answer was %zu bytes long.", packet_len);
11001100
SET_CLIENT_ERROR(stmt->error_info, CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE,
11011101
"Server responded to COM_STMT_SEND_LONG_DATA.");
11021102
ret = FAIL;

‎ext/mysqlnd/mysqlnd_vio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ MYSQLND_METHOD(mysqlnd_vio, network_read)(MYSQLND_VIO * const vio, zend_uchar *
8181
zend_uchar * p = buffer;
8282

8383
DBG_ENTER("mysqlnd_vio::network_read");
84-
DBG_INF_FMT("count="MYSQLND_SZ_T_SPEC, count);
84+
DBG_INF_FMT("count=%zu", count);
8585

8686
while (to_read) {
8787
ssize_t ret = php_stream_read(net_stream, (char *) p, to_read);
@@ -331,7 +331,7 @@ MYSQLND_METHOD(mysqlnd_vio, set_client_option)(MYSQLND_VIO * const net, enum_mys
331331
case MYSQLND_OPT_NET_READ_BUFFER_SIZE:
332332
DBG_INF("MYSQLND_OPT_NET_READ_BUFFER_SIZE");
333333
net->data->options.net_read_buffer_size = *(unsigned int*) value;
334-
DBG_INF_FMT("new_length="MYSQLND_SZ_T_SPEC, net->data->options.net_read_buffer_size);
334+
DBG_INF_FMT("new_length=%zu", net->data->options.net_read_buffer_size);
335335
break;
336336
case MYSQL_OPT_CONNECT_TIMEOUT:
337337
DBG_INF("MYSQL_OPT_CONNECT_TIMEOUT");

‎ext/mysqlnd/mysqlnd_wireprotocol.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ mysqlnd_read_header(MYSQLND_PFC * pfc, MYSQLND_VIO * vio, MYSQLND_PACKET_HEADER
266266
DBG_RETURN(PASS);
267267
}
268268

269-
DBG_ERR_FMT("Logical link: packets out of order. Expected %u received %u. Packet size="MYSQLND_SZ_T_SPEC,
269+
DBG_ERR_FMT("Logical link: packets out of order. Expected %u received %u. Packet size=%zu",
270270
pfc->data->packet_no, header->packet_no, header->size);
271271

272-
php_error(E_WARNING, "Packets out of order. Expected %u received %u. Packet size="MYSQLND_SZ_T_SPEC,
272+
php_error(E_WARNING, "Packets out of order. Expected %u received %u. Packet size=%zu",
273273
pfc->data->packet_no, header->packet_no, header->size);
274274
DBG_RETURN(FAIL);
275275
}
@@ -452,7 +452,7 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet)
452452
DBG_RETURN(PASS);
453453
premature_end:
454454
DBG_ERR_FMT("GREET packet %zu bytes shorter than expected", p - begin - packet->header.size);
455-
php_error_docref(NULL, E_WARNING, "GREET packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
455+
php_error_docref(NULL, E_WARNING, "GREET packet %zu bytes shorter than expected",
456456
p - begin - packet->header.size);
457457
DBG_RETURN(FAIL);
458458
}
@@ -727,7 +727,7 @@ php_mysqlnd_auth_response_read(MYSQLND_CONN_DATA * conn, void * _packet)
727727
DBG_RETURN(PASS);
728728
premature_end:
729729
DBG_ERR_FMT("OK packet %zu bytes shorter than expected", p - begin - packet->header.size);
730-
php_error_docref(NULL, E_WARNING, "AUTH_RESPONSE packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
730+
php_error_docref(NULL, E_WARNING, "AUTH_RESPONSE packet %zu bytes shorter than expected",
731731
p - begin - packet->header.size);
732732
DBG_RETURN(FAIL);
733733
}
@@ -867,7 +867,7 @@ php_mysqlnd_ok_read(MYSQLND_CONN_DATA * conn, void * _packet)
867867
DBG_RETURN(PASS);
868868
premature_end:
869869
DBG_ERR_FMT("OK packet %zu bytes shorter than expected", p - begin - packet->header.size);
870-
php_error_docref(NULL, E_WARNING, "OK packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
870+
php_error_docref(NULL, E_WARNING, "OK packet %zu bytes shorter than expected",
871871
p - begin - packet->header.size);
872872
DBG_RETURN(FAIL);
873873
}
@@ -954,7 +954,7 @@ php_mysqlnd_eof_read(MYSQLND_CONN_DATA * conn, void * _packet)
954954
DBG_RETURN(PASS);
955955
premature_end:
956956
DBG_ERR_FMT("EOF packet %zu bytes shorter than expected", p - begin - packet->header.size);
957-
php_error_docref(NULL, E_WARNING, "EOF packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
957+
php_error_docref(NULL, E_WARNING, "EOF packet %zu bytes shorter than expected",
958958
p - begin - packet->header.size);
959959
DBG_RETURN(FAIL);
960960
}
@@ -1114,7 +1114,7 @@ php_mysqlnd_rset_header_read(MYSQLND_CONN_DATA * conn, void * _packet)
11141114
DBG_RETURN(ret);
11151115
premature_end:
11161116
DBG_ERR_FMT("RSET_HEADER packet %zu bytes shorter than expected", p - begin - packet->header.size);
1117-
php_error_docref(NULL, E_WARNING, "RSET_HEADER packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
1117+
php_error_docref(NULL, E_WARNING, "RSET_HEADER packet %zu bytes shorter than expected",
11181118
p - begin - packet->header.size);
11191119
DBG_RETURN(FAIL);
11201120
}
@@ -1327,7 +1327,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
13271327
DBG_RETURN(FAIL);
13281328
premature_end:
13291329
DBG_ERR_FMT("RSET field packet %zu bytes shorter than expected", p - begin - packet->header.size);
1330-
php_error_docref(NULL, E_WARNING, "Result set field packet "MYSQLND_SZ_T_SPEC" bytes "
1330+
php_error_docref(NULL, E_WARNING, "Result set field packet %zu bytes "
13311331
"shorter than expected", p - begin - packet->header.size);
13321332
DBG_RETURN(FAIL);
13331333
}
@@ -1540,7 +1540,7 @@ php_mysqlnd_rowp_read_text_protocol(MYSQLND_ROW_BUFFER * row_buffer, zval * fiel
15401540
if (len == MYSQLND_NULL_LENGTH) {
15411541
ZVAL_NULL(current_field);
15421542
} else if ((p + len) > packet_end) {
1543-
php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing "MYSQLND_SZ_T_SPEC
1543+
php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing %zu"
15441544
" bytes after end of packet", (p + len) - packet_end - 1);
15451545
DBG_RETURN(FAIL);
15461546
} else {
@@ -1852,7 +1852,7 @@ php_mysqlnd_prepare_read(MYSQLND_CONN_DATA * conn, void * _packet)
18521852
DBG_RETURN(PASS);
18531853
premature_end:
18541854
DBG_ERR_FMT("PREPARE packet %zu bytes shorter than expected", p - begin - packet->header.size);
1855-
php_error_docref(NULL, E_WARNING, "PREPARE packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
1855+
php_error_docref(NULL, E_WARNING, "PREPARE packet %zu bytes shorter than expected",
18561856
p - begin - packet->header.size);
18571857
DBG_RETURN(FAIL);
18581858
}
@@ -1922,7 +1922,7 @@ php_mysqlnd_chg_user_read(MYSQLND_CONN_DATA * conn, void * _packet)
19221922
DBG_RETURN(PASS);
19231923
premature_end:
19241924
DBG_ERR_FMT("CHANGE_USER packet %zu bytes shorter than expected", p - begin - packet->header.size);
1925-
php_error_docref(NULL, E_WARNING, "CHANGE_USER packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
1925+
php_error_docref(NULL, E_WARNING, "CHANGE_USER packet %zu bytes shorter than expected",
19261926
p - begin - packet->header.size);
19271927
DBG_RETURN(FAIL);
19281928
}
@@ -2007,7 +2007,7 @@ php_mysqlnd_sha256_pk_request_response_read(MYSQLND_CONN_DATA * conn, void * _pa
20072007

20082008
premature_end:
20092009
DBG_ERR_FMT("OK packet %zu bytes shorter than expected", p - begin - packet->header.size);
2010-
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
2010+
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet %zu bytes shorter than expected",
20112011
p - begin - packet->header.size);
20122012
DBG_RETURN(FAIL);
20132013
}
@@ -2119,7 +2119,7 @@ php_mysqlnd_cached_sha2_result_read(MYSQLND_CONN_DATA * conn, void * _packet)
21192119

21202120
premature_end:
21212121
DBG_ERR_FMT("OK packet %zu bytes shorter than expected", p - begin - packet->header.size);
2122-
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected",
2122+
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet %zu bytes shorter than expected",
21232123
p - begin - packet->header.size);
21242124
DBG_RETURN(FAIL);
21252125
}

0 commit comments

Comments
 (0)