Skip to content

Commit 3fcb9a2

Browse files
mvorisekmvorisek
committed
fix c2099 for old compilers
1 parent 484873c commit 3fcb9a2

File tree

6 files changed

+108
-108
lines changed

6 files changed

+108
-108
lines changed

‎ext/mysqli/mysqli_driver.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ static int driver_driver_version_read(mysqli_object *obj, zval *retval, bool qui
9090
/* }}} */
9191

9292
const mysqli_property_entry mysqli_driver_property_entries[] = {
93-
{"client_info", strlen("client_info"), driver_client_info_read, NULL},
94-
{"client_version", strlen("client_version"), driver_client_version_read, NULL},
95-
{"driver_version", strlen("driver_version"), driver_driver_version_read, NULL},
96-
{"reconnect", strlen("reconnect"), driver_reconnect_read, driver_reconnect_write},
97-
{"report_mode", strlen("report_mode"), driver_report_read, driver_report_write},
93+
{"client_info", sizeof("client_info") - 1, driver_client_info_read, NULL},
94+
{"client_version", sizeof("client_version") - 1, driver_client_version_read, NULL},
95+
{"driver_version", sizeof("driver_version") - 1, driver_driver_version_read, NULL},
96+
{"reconnect", sizeof("reconnect") - 1, driver_reconnect_read, driver_reconnect_write},
97+
{"report_mode", sizeof("report_mode") - 1, driver_report_read, driver_report_write},
9898
{NULL, 0, NULL, NULL}
9999
};
100100

‎ext/mysqli/mysqli_prop.c

+33-33
Original file line numberDiff line numberDiff line change
@@ -403,47 +403,47 @@ MYSQLI_MAP_PROPERTY_FUNC_STR(stmt_sqlstate_read, mysql_stmt_sqlstate, MYSQLI_GET
403403

404404
/* }}} */
405405
const mysqli_property_entry mysqli_link_property_entries[] = {
406-
{"affected_rows", strlen("affected_rows"), link_affected_rows_read, NULL},
407-
{"client_info", strlen("client_info"), link_client_info_read, NULL},
408-
{"client_version", strlen("client_version"), link_client_version_read, NULL},
409-
{"connect_errno", strlen("connect_errno"), link_connect_errno_read, NULL},
410-
{"connect_error", strlen("connect_error"), link_connect_error_read, NULL},
411-
{"errno", strlen("errno"), link_errno_read, NULL},
412-
{"error", strlen("error"), link_error_read, NULL},
413-
{"error_list", strlen("error_list"), link_error_list_read, NULL},
414-
{"field_count", strlen("field_count"), link_field_count_read, NULL},
415-
{"host_info", strlen("host_info"), link_host_info_read, NULL},
416-
{"info", strlen("info"), link_info_read, NULL},
417-
{"insert_id", strlen("insert_id"), link_insert_id_read, NULL},
418-
{"server_info", strlen("server_info"), link_server_info_read, NULL},
419-
{"server_version", strlen("server_version"), link_server_version_read, NULL},
420-
{"sqlstate", strlen("sqlstate"), link_sqlstate_read, NULL},
421-
{"protocol_version",strlen("protocol_version"), link_protocol_version_read, NULL},
422-
{"thread_id", strlen("thread_id"), link_thread_id_read, NULL},
423-
{"warning_count", strlen("warning_count"), link_warning_count_read, NULL},
406+
{"affected_rows", sizeof("affected_rows") - 1, link_affected_rows_read, NULL},
407+
{"client_info", sizeof("client_info") - 1, link_client_info_read, NULL},
408+
{"client_version", sizeof("client_version") - 1, link_client_version_read, NULL},
409+
{"connect_errno", sizeof("connect_errno") - 1, link_connect_errno_read, NULL},
410+
{"connect_error", sizeof("connect_error") - 1, link_connect_error_read, NULL},
411+
{"errno", sizeof("errno") - 1, link_errno_read, NULL},
412+
{"error", sizeof("error") - 1, link_error_read, NULL},
413+
{"error_list", sizeof("error_list") - 1, link_error_list_read, NULL},
414+
{"field_count", sizeof("field_count") - 1, link_field_count_read, NULL},
415+
{"host_info", sizeof("host_info") - 1, link_host_info_read, NULL},
416+
{"info", sizeof("info") - 1, link_info_read, NULL},
417+
{"insert_id", sizeof("insert_id") - 1, link_insert_id_read, NULL},
418+
{"server_info", sizeof("server_info") - 1, link_server_info_read, NULL},
419+
{"server_version", sizeof("server_version") - 1, link_server_version_read, NULL},
420+
{"sqlstate", sizeof("sqlstate") - 1, link_sqlstate_read, NULL},
421+
{"protocol_version",sizeof("protocol_version") - 1, link_protocol_version_read, NULL},
422+
{"thread_id", sizeof("thread_id") - 1, link_thread_id_read, NULL},
423+
{"warning_count", sizeof("warning_count") - 1, link_warning_count_read, NULL},
424424
{NULL, 0, NULL, NULL}
425425
};
426426

427427

428428
const mysqli_property_entry mysqli_result_property_entries[] = {
429-
{"current_field",strlen("current_field"), result_current_field_read, NULL},
430-
{"field_count", strlen("field_count"), result_field_count_read, NULL},
431-
{"lengths", strlen("lengths"), result_lengths_read, NULL},
432-
{"num_rows", strlen("num_rows"), result_num_rows_read, NULL},
433-
{"type", strlen("type"), result_type_read, NULL},
429+
{"current_field",sizeof("current_field")-1, result_current_field_read, NULL},
430+
{"field_count", sizeof("field_count") - 1, result_field_count_read, NULL},
431+
{"lengths", sizeof("lengths") - 1, result_lengths_read, NULL},
432+
{"num_rows", sizeof("num_rows") - 1, result_num_rows_read, NULL},
433+
{"type", sizeof("type") - 1, result_type_read, NULL},
434434
{NULL, 0, NULL, NULL}
435435
};
436436

437437
const mysqli_property_entry mysqli_stmt_property_entries[] = {
438-
{"affected_rows", strlen("affected_rows"),stmt_affected_rows_read, NULL},
439-
{"insert_id", strlen("insert_id"), stmt_insert_id_read, NULL},
440-
{"num_rows", strlen("num_rows"), stmt_num_rows_read, NULL},
441-
{"param_count", strlen("param_count"), stmt_param_count_read, NULL},
442-
{"field_count", strlen("field_count"), stmt_field_count_read, NULL},
443-
{"errno", strlen("errno"), stmt_errno_read, NULL},
444-
{"error", strlen("error"), stmt_error_read, NULL},
445-
{"error_list", strlen("error_list"), stmt_error_list_read, NULL},
446-
{"sqlstate", strlen("sqlstate"), stmt_sqlstate_read, NULL},
447-
{"id", strlen("id"), stmt_id_read, NULL},
438+
{"affected_rows", sizeof("affected_rows")-1,stmt_affected_rows_read, NULL},
439+
{"insert_id", sizeof("insert_id") - 1, stmt_insert_id_read, NULL},
440+
{"num_rows", sizeof("num_rows") - 1, stmt_num_rows_read, NULL},
441+
{"param_count", sizeof("param_count") - 1, stmt_param_count_read, NULL},
442+
{"field_count", sizeof("field_count") - 1, stmt_field_count_read, NULL},
443+
{"errno", sizeof("errno") - 1, stmt_errno_read, NULL},
444+
{"error", sizeof("error") - 1, stmt_error_read, NULL},
445+
{"error_list", sizeof("error_list") - 1, stmt_error_list_read, NULL},
446+
{"sqlstate", sizeof("sqlstate") - 1, stmt_sqlstate_read, NULL},
447+
{"id", sizeof("id") - 1, stmt_id_read, NULL},
448448
{NULL, 0, NULL, NULL}
449449
};

‎ext/mysqli/mysqli_warning.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,9 @@ PHP_METHOD(mysqli_warning, __construct)
263263

264264
/* {{{ mysqli_warning_property_entries */
265265
const mysqli_property_entry mysqli_warning_property_entries[] = {
266-
{"message", strlen("message"), mysqli_warning_message, NULL},
267-
{"sqlstate", strlen("sqlstate"), mysqli_warning_sqlstate, NULL},
268-
{"errno", strlen("errno"), mysqli_warning_errno, NULL},
266+
{"message", sizeof("message") - 1, mysqli_warning_message, NULL},
267+
{"sqlstate", sizeof("sqlstate") - 1, mysqli_warning_sqlstate, NULL},
268+
{"errno", sizeof("errno") - 1, mysqli_warning_errno, NULL},
269269
{NULL, 0, NULL, NULL}
270270
};
271271
/* }}} */

‎ext/standard/html_tables.h

+33-33
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,39 @@ static const struct {
3838
uint32_t codeset_len;
3939
enum entity_charset charset;
4040
} charset_map[] = {
41-
{ "ISO-8859-1", strlen("ISO-8859-1"), cs_8859_1 },
42-
{ "ISO8859-1", strlen("ISO8859-1"), cs_8859_1 },
43-
{ "ISO-8859-15", strlen("ISO-8859-15"), cs_8859_15 },
44-
{ "ISO8859-15", strlen("ISO8859-15"), cs_8859_15 },
45-
{ "utf-8", strlen("utf-8"), cs_utf_8 },
46-
{ "cp1252", strlen("cp1252"), cs_cp1252 },
47-
{ "Windows-1252", strlen("Windows-1252"), cs_cp1252 },
48-
{ "1252", strlen("1252"), cs_cp1252 },
49-
{ "BIG5", strlen("BIG5"), cs_big5 },
50-
{ "950", strlen("950"), cs_big5 },
51-
{ "GB2312", strlen("GB2312"), cs_gb2312 },
52-
{ "936", strlen("936"), cs_gb2312 },
53-
{ "BIG5-HKSCS", strlen("BIG5-HKSCS"), cs_big5hkscs },
54-
{ "Shift_JIS", strlen("Shift_JIS"), cs_sjis },
55-
{ "SJIS", strlen("SJIS"), cs_sjis },
56-
{ "932", strlen("932"), cs_sjis },
57-
{ "SJIS-win", strlen("SJIS-win"), cs_sjis },
58-
{ "CP932", strlen("CP932"), cs_sjis },
59-
{ "EUCJP", strlen("EUCJP"), cs_eucjp },
60-
{ "EUC-JP", strlen("EUC-JP"), cs_eucjp },
61-
{ "eucJP-win", strlen("eucJP-win"), cs_eucjp },
62-
{ "KOI8-R", strlen("KOI8-R"), cs_koi8r },
63-
{ "koi8-ru", strlen("koi8-ru"), cs_koi8r },
64-
{ "koi8r", strlen("koi8r"), cs_koi8r },
65-
{ "cp1251", strlen("cp1251"), cs_cp1251 },
66-
{ "Windows-1251", strlen("Windows-1251"), cs_cp1251 },
67-
{ "win-1251", strlen("win-1251"), cs_cp1251 },
68-
{ "iso8859-5", strlen("iso8859-5"), cs_8859_5 },
69-
{ "iso-8859-5", strlen("iso-8859-5"), cs_8859_5 },
70-
{ "cp866", strlen("cp866"), cs_cp866 },
71-
{ "866", strlen("866"), cs_cp866 },
72-
{ "ibm866", strlen("ibm866"), cs_cp866 },
73-
{ "MacRoman", strlen("MacRoman"), cs_macroman }
41+
{ "ISO-8859-1", sizeof("ISO-8859-1")-1, cs_8859_1 },
42+
{ "ISO8859-1", sizeof("ISO8859-1")-1, cs_8859_1 },
43+
{ "ISO-8859-15", sizeof("ISO-8859-15")-1, cs_8859_15 },
44+
{ "ISO8859-15", sizeof("ISO8859-15")-1, cs_8859_15 },
45+
{ "utf-8", sizeof("utf-8")-1, cs_utf_8 },
46+
{ "cp1252", sizeof("cp1252")-1, cs_cp1252 },
47+
{ "Windows-1252", sizeof("Windows-1252")-1, cs_cp1252 },
48+
{ "1252", sizeof("1252")-1, cs_cp1252 },
49+
{ "BIG5", sizeof("BIG5")-1, cs_big5 },
50+
{ "950", sizeof("950")-1, cs_big5 },
51+
{ "GB2312", sizeof("GB2312")-1, cs_gb2312 },
52+
{ "936", sizeof("936")-1, cs_gb2312 },
53+
{ "BIG5-HKSCS", sizeof("BIG5-HKSCS")-1, cs_big5hkscs },
54+
{ "Shift_JIS", sizeof("Shift_JIS")-1, cs_sjis },
55+
{ "SJIS", sizeof("SJIS")-1, cs_sjis },
56+
{ "932", sizeof("932")-1, cs_sjis },
57+
{ "SJIS-win", sizeof("SJIS-win")-1, cs_sjis },
58+
{ "CP932", sizeof("CP932")-1, cs_sjis },
59+
{ "EUCJP", sizeof("EUCJP")-1, cs_eucjp },
60+
{ "EUC-JP", sizeof("EUC-JP")-1, cs_eucjp },
61+
{ "eucJP-win", sizeof("eucJP-win")-1, cs_eucjp },
62+
{ "KOI8-R", sizeof("KOI8-R")-1, cs_koi8r },
63+
{ "koi8-ru", sizeof("koi8-ru")-1, cs_koi8r },
64+
{ "koi8r", sizeof("koi8r")-1, cs_koi8r },
65+
{ "cp1251", sizeof("cp1251")-1, cs_cp1251 },
66+
{ "Windows-1251", sizeof("Windows-1251")-1, cs_cp1251 },
67+
{ "win-1251", sizeof("win-1251")-1, cs_cp1251 },
68+
{ "iso8859-5", sizeof("iso8859-5")-1, cs_8859_5 },
69+
{ "iso-8859-5", sizeof("iso-8859-5")-1, cs_8859_5 },
70+
{ "cp866", sizeof("cp866")-1, cs_cp866 },
71+
{ "866", sizeof("866")-1, cs_cp866 },
72+
{ "ibm866", sizeof("ibm866")-1, cs_cp866 },
73+
{ "MacRoman", sizeof("MacRoman")-1, cs_macroman }
7474
};
7575

7676
/* longest entity name length excluding & and ; */

‎ext/standard/html_tables/html_table_gen.php

+33-33
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,39 @@ enum entity_charset { cs_utf_8, cs_8859_1, cs_cp1252, cs_8859_15, cs_cp1251,
6060
uint32_t codeset_len;
6161
enum entity_charset charset;
6262
} charset_map[] = {
63-
{ "ISO-8859-1", strlen("ISO-8859-1"), cs_8859_1 },
64-
{ "ISO8859-1", strlen("ISO8859-1"), cs_8859_1 },
65-
{ "ISO-8859-15", strlen("ISO-8859-15"), cs_8859_15 },
66-
{ "ISO8859-15", strlen("ISO8859-15"), cs_8859_15 },
67-
{ "utf-8", strlen("utf-8"), cs_utf_8 },
68-
{ "cp1252", strlen("cp1252"), cs_cp1252 },
69-
{ "Windows-1252", strlen("Windows-1252"), cs_cp1252 },
70-
{ "1252", strlen("1252"), cs_cp1252 },
71-
{ "BIG5", strlen("BIG5"), cs_big5 },
72-
{ "950", strlen("950"), cs_big5 },
73-
{ "GB2312", strlen("GB2312"), cs_gb2312 },
74-
{ "936", strlen("936"), cs_gb2312 },
75-
{ "BIG5-HKSCS", strlen("BIG5-HKSCS"), cs_big5hkscs },
76-
{ "Shift_JIS", strlen("Shift_JIS"), cs_sjis },
77-
{ "SJIS", strlen("SJIS"), cs_sjis },
78-
{ "932", strlen("932"), cs_sjis },
79-
{ "SJIS-win", strlen("SJIS-win"), cs_sjis },
80-
{ "CP932", strlen("CP932"), cs_sjis },
81-
{ "EUCJP", strlen("EUCJP"), cs_eucjp },
82-
{ "EUC-JP", strlen("EUC-JP"), cs_eucjp },
83-
{ "eucJP-win", strlen("eucJP-win"), cs_eucjp },
84-
{ "KOI8-R", strlen("KOI8-R"), cs_koi8r },
85-
{ "koi8-ru", strlen("koi8-ru"), cs_koi8r },
86-
{ "koi8r", strlen("koi8r"), cs_koi8r },
87-
{ "cp1251", strlen("cp1251"), cs_cp1251 },
88-
{ "Windows-1251", strlen("Windows-1251"), cs_cp1251 },
89-
{ "win-1251", strlen("win-1251"), cs_cp1251 },
90-
{ "iso8859-5", strlen("iso8859-5"), cs_8859_5 },
91-
{ "iso-8859-5", strlen("iso-8859-5"), cs_8859_5 },
92-
{ "cp866", strlen("cp866"), cs_cp866 },
93-
{ "866", strlen("866"), cs_cp866 },
94-
{ "ibm866", strlen("ibm866"), cs_cp866 },
95-
{ "MacRoman", strlen("MacRoman"), cs_macroman }
63+
{ "ISO-8859-1", sizeof("ISO-8859-1")-1, cs_8859_1 },
64+
{ "ISO8859-1", sizeof("ISO8859-1")-1, cs_8859_1 },
65+
{ "ISO-8859-15", sizeof("ISO-8859-15")-1, cs_8859_15 },
66+
{ "ISO8859-15", sizeof("ISO8859-15")-1, cs_8859_15 },
67+
{ "utf-8", sizeof("utf-8")-1, cs_utf_8 },
68+
{ "cp1252", sizeof("cp1252")-1, cs_cp1252 },
69+
{ "Windows-1252", sizeof("Windows-1252")-1, cs_cp1252 },
70+
{ "1252", sizeof("1252")-1, cs_cp1252 },
71+
{ "BIG5", sizeof("BIG5")-1, cs_big5 },
72+
{ "950", sizeof("950")-1, cs_big5 },
73+
{ "GB2312", sizeof("GB2312")-1, cs_gb2312 },
74+
{ "936", sizeof("936")-1, cs_gb2312 },
75+
{ "BIG5-HKSCS", sizeof("BIG5-HKSCS")-1, cs_big5hkscs },
76+
{ "Shift_JIS", sizeof("Shift_JIS")-1, cs_sjis },
77+
{ "SJIS", sizeof("SJIS")-1, cs_sjis },
78+
{ "932", sizeof("932")-1, cs_sjis },
79+
{ "SJIS-win", sizeof("SJIS-win")-1, cs_sjis },
80+
{ "CP932", sizeof("CP932")-1, cs_sjis },
81+
{ "EUCJP", sizeof("EUCJP")-1, cs_eucjp },
82+
{ "EUC-JP", sizeof("EUC-JP")-1, cs_eucjp },
83+
{ "eucJP-win", sizeof("eucJP-win")-1, cs_eucjp },
84+
{ "KOI8-R", sizeof("KOI8-R")-1, cs_koi8r },
85+
{ "koi8-ru", sizeof("koi8-ru")-1, cs_koi8r },
86+
{ "koi8r", sizeof("koi8r")-1, cs_koi8r },
87+
{ "cp1251", sizeof("cp1251")-1, cs_cp1251 },
88+
{ "Windows-1251", sizeof("Windows-1251")-1, cs_cp1251 },
89+
{ "win-1251", sizeof("win-1251")-1, cs_cp1251 },
90+
{ "iso8859-5", sizeof("iso8859-5")-1, cs_8859_5 },
91+
{ "iso-8859-5", sizeof("iso-8859-5")-1, cs_8859_5 },
92+
{ "cp866", sizeof("cp866")-1, cs_cp866 },
93+
{ "866", sizeof("866")-1, cs_cp866 },
94+
{ "ibm866", sizeof("ibm866")-1, cs_cp866 },
95+
{ "MacRoman", sizeof("MacRoman")-1, cs_macroman }
9696
};
9797
9898
/* longest entity name length excluding & and ; */

‎ext/standard/url_scanner_ex.re

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static void handle_form(STD_PARA)
423423

424424
if (ZSTR_LEN(ctx->form_app.s) > 0) {
425425
switch (ZSTR_LEN(ctx->tag.s)) {
426-
case strlen("form"):
426+
case sizeof("form") - 1:
427427
if (!strncasecmp(ZSTR_VAL(ctx->tag.s), "form", ZSTR_LEN(ctx->tag.s))
428428
&& check_host_whitelist(ctx) == SUCCESS) {
429429
doit = 1;

0 commit comments

Comments
 (0)