Skip to content

Commit c492c90

Browse files
nikicnikic
committed
Fix mysqlnd debug formats on 32-bit
1 parent 57f06b6 commit c492c90

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎ext/mysqlnd/mysqlnd_commands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ MYSQLND_METHOD(mysqlnd_command, enable_ssl)(MYSQLND_CONN_DATA * const conn, cons
524524

525525
DBG_ENTER("mysqlnd_command::enable_ssl");
526526

527-
DBG_INF_FMT("client_capability_flags=%lu", client_capabilities);
527+
DBG_INF_FMT("client_capability_flags=%zu", client_capabilities);
528528
DBG_INF_FMT("CLIENT_LONG_PASSWORD= %d", client_capabilities & CLIENT_LONG_PASSWORD? 1:0);
529529
DBG_INF_FMT("CLIENT_FOUND_ROWS= %d", client_capabilities & CLIENT_FOUND_ROWS? 1:0);
530530
DBG_INF_FMT("CLIENT_LONG_FLAG= %d", client_capabilities & CLIENT_LONG_FLAG? 1:0);

‎ext/mysqlnd/mysqlnd_ps.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ MYSQLND_METHOD(mysqlnd_stmt, store_result)(MYSQLND_STMT * const s)
8080
if (!stmt || !conn || !stmt->result) {
8181
DBG_RETURN(NULL);
8282
}
83-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
83+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
8484

8585
/* be compliant with libmysql - NULL will turn */
8686
if (!stmt->field_count) {
@@ -150,7 +150,7 @@ MYSQLND_METHOD(mysqlnd_stmt, get_result)(MYSQLND_STMT * const s)
150150
if (!stmt || !conn || !stmt->result) {
151151
DBG_RETURN(NULL);
152152
}
153-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
153+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
154154

155155
/* be compliant with libmysql - NULL will turn */
156156
if (!stmt->field_count) {
@@ -230,7 +230,7 @@ MYSQLND_METHOD(mysqlnd_stmt, next_result)(MYSQLND_STMT * s)
230230
if (!stmt || !conn || !stmt->result) {
231231
DBG_RETURN(FAIL);
232232
}
233-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
233+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
234234

235235
if (GET_CONNECTION_STATE(&conn->state) != CONN_NEXT_RESULT_PENDING || !(UPSERT_STATUS_GET_SERVER_STATUS(conn->upsert_status) & SERVER_MORE_RESULTS_EXISTS)) {
236236
DBG_RETURN(FAIL);
@@ -268,7 +268,7 @@ mysqlnd_stmt_skip_metadata(MYSQLND_STMT * s)
268268
if (!pool) {
269269
DBG_RETURN(FAIL);
270270
}
271-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
271+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
272272

273273
conn->payload_decoder_factory->m.init_result_field_packet(&field_packet);
274274
field_packet.memory_pool = pool;
@@ -302,7 +302,7 @@ mysqlnd_stmt_read_prepare_response(MYSQLND_STMT * s)
302302
if (!stmt || !conn) {
303303
DBG_RETURN(FAIL);
304304
}
305-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
305+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
306306

307307
conn->payload_decoder_factory->m.init_prepare_response_packet(&prepare_resp);
308308

@@ -342,7 +342,7 @@ mysqlnd_stmt_prepare_read_eof(MYSQLND_STMT * s)
342342
if (!stmt || !conn) {
343343
DBG_RETURN(FAIL);
344344
}
345-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
345+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
346346

347347
conn->payload_decoder_factory->m.init_eof_packet(&fields_eof);
348348
if (FAIL == (ret = PACKET_READ(conn, &fields_eof))) {
@@ -380,7 +380,7 @@ MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const
380380
if (!stmt || !conn) {
381381
DBG_RETURN(FAIL);
382382
}
383-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
383+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
384384
DBG_INF_FMT("query=%s", query);
385385

386386
UPSERT_STATUS_SET_AFFECTED_ROWS_TO_ERROR(stmt->upsert_status);
@@ -659,7 +659,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_execute)(MYSQLND_STMT * const s, const enum_my
659659
if (!stmt || !conn) {
660660
DBG_RETURN(FAIL);
661661
}
662-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
662+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
663663

664664
UPSERT_STATUS_SET_AFFECTED_ROWS_TO_ERROR(stmt->upsert_status);
665665
UPSERT_STATUS_SET_AFFECTED_ROWS_TO_ERROR(conn->upsert_status);
@@ -743,7 +743,7 @@ MYSQLND_METHOD(mysqlnd_stmt, use_result)(MYSQLND_STMT * s)
743743
if (!stmt || !conn || !stmt->result) {
744744
DBG_RETURN(NULL);
745745
}
746-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
746+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
747747

748748
if (!stmt->field_count || !mysqlnd_stmt_check_state(stmt)) {
749749
SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync);
@@ -784,7 +784,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, zval **row_ptr, const unsign
784784
DBG_ERR("no statement");
785785
DBG_RETURN(FAIL);
786786
}
787-
DBG_INF_FMT("stmt=%lu flags=%u", stmt->stmt_id, flags);
787+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " flags=%u", stmt->stmt_id, flags);
788788

789789
if (stmt->state < MYSQLND_STMT_USER_FETCHING) {
790790
/* Only initted - error */
@@ -874,7 +874,7 @@ MYSQLND_METHOD(mysqlnd_stmt, fetch)(MYSQLND_STMT * const s, bool * const fetched
874874
if (!stmt || !stmt->conn) {
875875
DBG_RETURN(FAIL);
876876
}
877-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
877+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
878878

879879
if (!stmt->result || stmt->state < MYSQLND_STMT_WAITING_USE_OR_STORE) {
880880
SET_CLIENT_ERROR(stmt->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync);
@@ -925,7 +925,7 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s)
925925
if (!stmt || !conn) {
926926
DBG_RETURN(FAIL);
927927
}
928-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
928+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
929929

930930
SET_EMPTY_ERROR(stmt->error_info);
931931
SET_EMPTY_ERROR(conn->error_info);
@@ -979,7 +979,7 @@ MYSQLND_METHOD(mysqlnd_stmt, flush)(MYSQLND_STMT * const s)
979979
if (!stmt || !conn) {
980980
DBG_RETURN(FAIL);
981981
}
982-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
982+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
983983

984984
if (stmt->stmt_id) {
985985
/*
@@ -1020,7 +1020,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned in
10201020
if (!stmt || !conn) {
10211021
DBG_RETURN(FAIL);
10221022
}
1023-
DBG_INF_FMT("stmt=%lu param_no=%u data_len=%lu", stmt->stmt_id, param_no, data_length);
1023+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " param_no=%u data_len=" ZEND_ULONG_FMT, stmt->stmt_id, param_no, data_length);
10241024

10251025
SET_EMPTY_ERROR(stmt->error_info);
10261026
SET_EMPTY_ERROR(conn->error_info);
@@ -1121,7 +1121,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_parameters)(MYSQLND_STMT * const s, MYSQLND_PA
11211121
if (!stmt || !conn) {
11221122
DBG_RETURN(FAIL);
11231123
}
1124-
DBG_INF_FMT("stmt=%lu param_count=%u", stmt->stmt_id, stmt->param_count);
1124+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " param_count=%u", stmt->stmt_id, stmt->param_count);
11251125

11261126
if (stmt->state < MYSQLND_STMT_PREPARED) {
11271127
SET_CLIENT_ERROR(stmt->error_info, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
@@ -1194,7 +1194,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigne
11941194
if (!stmt || !conn) {
11951195
DBG_RETURN(FAIL);
11961196
}
1197-
DBG_INF_FMT("stmt=%lu param_no=%u param_count=%u type=%u", stmt->stmt_id, param_no, stmt->param_count, type);
1197+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " param_no=%u param_count=%u type=%u", stmt->stmt_id, param_no, stmt->param_count, type);
11981198

11991199
if (stmt->state < MYSQLND_STMT_PREPARED) {
12001200
SET_CLIENT_ERROR(stmt->error_info, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
@@ -1250,7 +1250,7 @@ MYSQLND_METHOD(mysqlnd_stmt, refresh_bind_param)(MYSQLND_STMT * const s)
12501250
if (!stmt || !conn) {
12511251
DBG_RETURN(FAIL);
12521252
}
1253-
DBG_INF_FMT("stmt=%lu param_count=%u", stmt->stmt_id, stmt->param_count);
1253+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " param_count=%u", stmt->stmt_id, stmt->param_count);
12541254

12551255
if (stmt->state < MYSQLND_STMT_PREPARED) {
12561256
SET_CLIENT_ERROR(stmt->error_info, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
@@ -1281,7 +1281,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const s,
12811281
if (!stmt || !conn) {
12821282
DBG_RETURN(FAIL);
12831283
}
1284-
DBG_INF_FMT("stmt=%lu field_count=%u", stmt->stmt_id, stmt->field_count);
1284+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " field_count=%u", stmt->stmt_id, stmt->field_count);
12851285

12861286
if (stmt->state < MYSQLND_STMT_PREPARED) {
12871287
SET_CLIENT_ERROR(stmt->error_info, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
@@ -1338,7 +1338,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const s, unsigned i
13381338
if (!stmt || !conn) {
13391339
DBG_RETURN(FAIL);
13401340
}
1341-
DBG_INF_FMT("stmt=%lu field_count=%u", stmt->stmt_id, stmt->field_count);
1341+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " field_count=%u", stmt->stmt_id, stmt->field_count);
13421342

13431343
if (stmt->state < MYSQLND_STMT_PREPARED) {
13441344
SET_CLIENT_ERROR(stmt->error_info, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
@@ -1559,7 +1559,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s,
15591559
if (!stmt) {
15601560
DBG_RETURN(FAIL);
15611561
}
1562-
DBG_INF_FMT("stmt=%lu attr_type=%u", stmt->stmt_id, attr_type);
1562+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " attr_type=%u", stmt->stmt_id, attr_type);
15631563

15641564
switch (attr_type) {
15651565
case STMT_ATTR_UPDATE_MAX_LENGTH:{
@@ -1614,7 +1614,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_get)(const MYSQLND_STMT * const s,
16141614
if (!stmt) {
16151615
DBG_RETURN(FAIL);
16161616
}
1617-
DBG_INF_FMT("stmt=%lu attr_type=%u", stmt->stmt_id, attr_type);
1617+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " attr_type=%u", stmt->stmt_id, attr_type);
16181618

16191619
switch (attr_type) {
16201620
case STMT_ATTR_UPDATE_MAX_LENGTH:
@@ -1649,7 +1649,7 @@ MYSQLND_METHOD(mysqlnd_stmt, free_result)(MYSQLND_STMT * const s)
16491649
if (!stmt || !conn) {
16501650
DBG_RETURN(FAIL);
16511651
}
1652-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
1652+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
16531653

16541654
if (!stmt->result) {
16551655
DBG_INF("no result");
@@ -1702,7 +1702,7 @@ mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const s)
17021702
if (!stmt) {
17031703
DBG_VOID_RETURN;
17041704
}
1705-
DBG_INF_FMT("stmt=%lu result_bind=%p field_count=%u", stmt->stmt_id, stmt->result_bind, stmt->field_count);
1705+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " result_bind=%p field_count=%u", stmt->stmt_id, stmt->result_bind, stmt->field_count);
17061706

17071707
if (!stmt->result_bind) {
17081708
DBG_VOID_RETURN;
@@ -1765,7 +1765,7 @@ MYSQLND_METHOD(mysqlnd_stmt, free_stmt_content)(MYSQLND_STMT * const s)
17651765
if (!stmt) {
17661766
DBG_VOID_RETURN;
17671767
}
1768-
DBG_INF_FMT("stmt=%lu param_bind=%p param_count=%u", stmt->stmt_id, stmt->param_bind, stmt->param_count);
1768+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT " param_bind=%p param_count=%u", stmt->stmt_id, stmt->param_bind, stmt->param_count);
17691769

17701770
/* Destroy the input bind */
17711771
if (stmt->param_bind) {
@@ -1804,7 +1804,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, close_on_server)(MYSQLND_STMT * const s, bo
18041804
if (!stmt || !conn) {
18051805
DBG_RETURN(FAIL);
18061806
}
1807-
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
1807+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt->stmt_id);
18081808

18091809
SET_EMPTY_ERROR(stmt->error_info);
18101810
SET_EMPTY_ERROR(conn->error_info);

‎ext/mysqlnd/mysqlnd_ps_codec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, const unsigned int
334334
{
335335
const zend_ulong length = php_mysqlnd_net_field_length(row);
336336
DBG_ENTER("ps_fetch_string");
337-
DBG_INF_FMT("len = %lu", length);
337+
DBG_INF_FMT("len = " ZEND_ULONG_FMT, length);
338338
DBG_INF("copying from the row buffer");
339339
ZVAL_STRINGL_FAST(zv, (char *)*row, length);
340340

‎ext/mysqlnd/mysqlnd_result.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
177177
MYSQLND_PACKET_EOF fields_eof;
178178

179179
DBG_ENTER("mysqlnd_query_read_result_set_header");
180-
DBG_INF_FMT("stmt=%lu", stmt? stmt->stmt_id:0);
180+
DBG_INF_FMT("stmt=" ZEND_ULONG_FMT, stmt? stmt->stmt_id:0);
181181

182182
ret = FAIL;
183183
do {
@@ -834,7 +834,7 @@ static enum_func_status
834834
MYSQLND_METHOD(mysqlnd_res, data_seek)(MYSQLND_RES * const result, const uint64_t row)
835835
{
836836
DBG_ENTER("mysqlnd_res::data_seek");
837-
DBG_INF_FMT("row=%lu", row);
837+
DBG_INF_FMT("row=%" PRIu64, row);
838838

839839
DBG_RETURN(result->stored_data? result->stored_data->m.data_seek(result->stored_data, row) : FAIL);
840840
}

0 commit comments

Comments
 (0)