Skip to content

Commit 042897f

Browse files
NattyNarwhalNattyNarwhal
committed
Remove the add...stringl wrapper macros
1 parent c153d88 commit 042897f

File tree

1 file changed

+44
-51
lines changed

1 file changed

+44
-51
lines changed

‎ibm_db2.c

Lines changed: 44 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,6 @@ return
7272

7373
#define ZEND_Z_TYPE_PP(entry) ZEND_Z_TYPE_P(*entry)
7474

75-
#define ADD_PROPERTY_STRINGL(val1, val2, val3, val4, val5) add_property_stringl(val1, val2, val3, val4)
76-
77-
#define ADD_ASSOC_STRINGL(val1, val2, val3, val4, val5) add_assoc_stringl(val1, val2, val3, val4)
78-
79-
#define ADD_INDEX_STRINGL(val1, val2, val3, val4, val5) add_index_stringl(val1, val2, val3, val4)
80-
81-
8275
#if PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70300
8376
#define GC_ADDREF(p) ++GC_REFCOUNT(p)
8477
#define GC_DELREF(p) --GC_REFCOUNT(p)
@@ -6570,23 +6563,23 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
65706563
break;
65716564
}
65726565
if ( op & DB2_FETCH_ASSOC ) {
6573-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name,
6574-
(char *)row_data->str_val, i5trim, 1);
6566+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name,
6567+
(char *)row_data->str_val, i5trim);
65756568
}
65766569
if ( op & DB2_FETCH_INDEX ) {
6577-
ADD_INDEX_STRINGL(return_value, i, (char *)row_data->str_val,
6578-
i5trim, 1);
6570+
add_index_stringl(return_value, i, (char *)row_data->str_val,
6571+
i5trim);
65796572
}
65806573
break;
65816574
}
65826575
#endif /* PASE */
65836576
if ( op & DB2_FETCH_ASSOC ) {
6584-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name,
6585-
(char *)row_data->str_val, strlen((char *)row_data->str_val), 1);
6577+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name,
6578+
(char *)row_data->str_val, strlen((char *)row_data->str_val));
65866579
}
65876580
if ( op & DB2_FETCH_INDEX ) {
6588-
ADD_INDEX_STRINGL(return_value, i, (char *)row_data->str_val,
6589-
strlen((char *)row_data->str_val), 1);
6581+
add_index_stringl(return_value, i, (char *)row_data->str_val,
6582+
strlen((char *)row_data->str_val));
65906583
}
65916584
break;
65926585
case SQL_SMALLINT:
@@ -6640,29 +6633,29 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
66406633
case SQL_VARBINARY:
66416634
if ( stmt_res->s_bin_mode == DB2_PASSTHRU ) {
66426635
if ( op & DB2_FETCH_ASSOC ) {
6643-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name, "", 0, 1);
6636+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name, "", 0);
66446637
}
66456638
if ( op & DB2_FETCH_INDEX ) {
6646-
ADD_INDEX_STRINGL(return_value, i, "", 0, 1);
6639+
add_index_stringl(return_value, i, "", 0);
66476640
}
66486641
} else {
66496642
#ifdef PASE /* i5/OS BINARY is strlen incompatible (may work for LUW) */
66506643
if ( op & DB2_FETCH_ASSOC ) {
6651-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name,
6652-
(char *)row_data->str_val, out_length, 1);
6644+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name,
6645+
(char *)row_data->str_val, out_length);
66536646
}
66546647
if ( op & DB2_FETCH_INDEX ) {
6655-
ADD_INDEX_STRINGL(return_value, i, (char *)row_data->str_val,
6656-
out_length, 1);
6648+
add_index_stringl(return_value, i, (char *)row_data->str_val,
6649+
out_length);
66576650
}
66586651
#else
66596652
if ( op & DB2_FETCH_ASSOC ) {
6660-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name,
6661-
(char *)row_data->str_val, strlen((char *)row_data->str_val), 1);
6653+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name,
6654+
(char *)row_data->str_val, strlen((char *)row_data->str_val));
66626655
}
66636656
if ( op & DB2_FETCH_INDEX ) {
6664-
ADD_INDEX_STRINGL(return_value, i, (char *)row_data->str_val,
6665-
strlen((char *)row_data->str_val), 1);
6657+
add_index_stringl(return_value, i, (char *)row_data->str_val,
6658+
strlen((char *)row_data->str_val));
66666659
}
66676660
#endif /* PASE */
66686661
}
@@ -6711,10 +6704,10 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
67116704
}
67126705

67136706
if ( op & DB2_FETCH_ASSOC ) {
6714-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name, (char *)out_ptr, out_length, 1);
6707+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name, (char *)out_ptr, out_length);
67156708
}
67166709
if ( op & DB2_FETCH_INDEX ) {
6717-
ADD_INDEX_STRINGL(return_value, i, (char *)out_ptr, out_length, DB2_FETCH_BOTH & op);
6710+
add_index_stringl(return_value, i, (char *)out_ptr, out_length);
67186711
}
67196712

67206713
efree(out_ptr);
@@ -6762,10 +6755,10 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
67626755
}
67636756

67646757
if ( op & DB2_FETCH_ASSOC ) {
6765-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name, (char *)out_ptr, out_length, 1);
6758+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name, (char *)out_ptr, out_length);
67666759
}
67676760
if ( op & DB2_FETCH_INDEX ) {
6768-
ADD_INDEX_STRINGL(return_value, i, (char *)out_ptr, out_length, DB2_FETCH_BOTH & op);
6761+
add_index_stringl(return_value, i, (char *)out_ptr, out_length);
67696762
}
67706763

67716764
efree(out_ptr);
@@ -6803,10 +6796,10 @@ static void _php_db2_bind_fetch_helper(INTERNAL_FUNCTION_PARAMETERS, int op)
68036796
}
68046797

68056798
if ( op & DB2_FETCH_ASSOC ) {
6806-
ADD_ASSOC_STRINGL(return_value, (char *)stmt_res->column_info[i].name, (char *)out_ptr, out_length, 1);
6799+
add_assoc_stringl(return_value, (char *)stmt_res->column_info[i].name, (char *)out_ptr, out_length);
68076800
}
68086801
if ( op & DB2_FETCH_INDEX ) {
6809-
ADD_INDEX_STRINGL(return_value, i, (char *)out_ptr, out_length, DB2_FETCH_BOTH & op);
6802+
add_index_stringl(return_value, i, (char *)out_ptr, out_length);
68106803
}
68116804
efree(out_ptr);
68126805
}
@@ -6998,7 +6991,7 @@ PHP_FUNCTION(db2_server_info)
69986991
RETURN_FALSE;
69996992
return;
70006993
} else {
7001-
ADD_PROPERTY_STRINGL(return_value, "DBMS_NAME", (char *)buffer255, strlen((char *)buffer255), 1);
6994+
add_property_stringl(return_value, "DBMS_NAME", (char *)buffer255, strlen((char *)buffer255));
70026995
}
70036996

70046997
/* DBMS_VER */
@@ -7010,7 +7003,7 @@ PHP_FUNCTION(db2_server_info)
70107003
RETURN_FALSE;
70117004
return;
70127005
} else {
7013-
ADD_PROPERTY_STRINGL(return_value, "DBMS_VER", (char *)buffer11, strlen((char *)buffer11), 1);
7006+
add_property_stringl(return_value, "DBMS_VER", (char *)buffer11, strlen((char *)buffer11));
70147007
}
70157008

70167009
#ifndef PASE /* i5/OS DB_CODEPAGE handled natively */
@@ -7038,7 +7031,7 @@ PHP_FUNCTION(db2_server_info)
70387031
return;
70397032
#endif /* not PASE */
70407033
} else {
7041-
ADD_PROPERTY_STRINGL(return_value, "DB_NAME", (char *)buffer255, strlen((char *)buffer255), 1);
7034+
add_property_stringl(return_value, "DB_NAME", (char *)buffer255, strlen((char *)buffer255));
70427035
}
70437036

70447037
#ifndef PASE /* i5/OS INST_NAME handled natively */
@@ -7051,7 +7044,7 @@ PHP_FUNCTION(db2_server_info)
70517044
RETURN_FALSE;
70527045
return;
70537046
} else {
7054-
ADD_PROPERTY_STRINGL(return_value, "INST_NAME", (char *)buffer255, strlen((char *)buffer255), 1);
7047+
add_property_stringl(return_value, "INST_NAME", (char *)buffer255, strlen((char *)buffer255));
70557048
}
70567049
#endif /* PASE */
70577050

@@ -7065,7 +7058,7 @@ PHP_FUNCTION(db2_server_info)
70657058
RETURN_FALSE;
70667059
return;
70677060
} else {
7068-
ADD_PROPERTY_STRINGL(return_value, "SPECIAL_CHARS", (char *)buffer255, strlen((char *)buffer255), 1);
7061+
add_property_stringl(return_value, "SPECIAL_CHARS", (char *)buffer255, strlen((char *)buffer255));
70697062
}
70707063
#endif /* PASE */
70717064

@@ -7089,7 +7082,7 @@ PHP_FUNCTION(db2_server_info)
70897082

70907083
keyword = php_strtok_r((char *)buffer2k, ",", &last);
70917084
while (keyword) {
7092-
ADD_INDEX_STRINGL(karray, key++, keyword, strlen(keyword), 1);
7085+
add_index_stringl(karray, key++, keyword, strlen(keyword));
70937086
keyword = php_strtok_r(NULL, ",", &last);
70947087
}
70957088

@@ -7124,7 +7117,7 @@ PHP_FUNCTION(db2_server_info)
71247117
strcpy((char *)buffer11, "NC");
71257118
}
71267119

7127-
ADD_PROPERTY_STRINGL(return_value, "DFT_ISOLATION", (char *)buffer11, strlen((char *)buffer11), 1);
7120+
add_property_stringl(return_value, "DFT_ISOLATION", (char *)buffer11, strlen((char *)buffer11));
71287121
}
71297122

71307123
/* ISOLATION_OPTION */
@@ -7149,19 +7142,19 @@ PHP_FUNCTION(db2_server_info)
71497142
array_init(array);
71507143

71517144
if( bitmask & SQL_TXN_READ_UNCOMMITTED ) {
7152-
ADD_INDEX_STRINGL(array, key++, "UR", 2, 1);
7145+
add_index_stringl(array, key++, "UR", 2);
71537146
}
71547147
if( bitmask & SQL_TXN_READ_COMMITTED ) {
7155-
ADD_INDEX_STRINGL(array, key++, "CS", 2, 1);
7148+
add_index_stringl(array, key++, "CS", 2);
71567149
}
71577150
if( bitmask & SQL_TXN_REPEATABLE_READ ) {
7158-
ADD_INDEX_STRINGL(array, key++, "RS", 2, 1);
7151+
add_index_stringl(array, key++, "RS", 2);
71597152
}
71607153
if( bitmask & SQL_TXN_SERIALIZABLE ) {
7161-
ADD_INDEX_STRINGL(array, key++, "RR", 2, 1);
7154+
add_index_stringl(array, key++, "RR", 2);
71627155
}
71637156
if( bitmask & SQL_TXN_NOCOMMIT ) {
7164-
ADD_INDEX_STRINGL(array, key++, "NC", 2, 1);
7157+
add_index_stringl(array, key++, "NC", 2);
71657158
}
71667159

71677160
add_property_zval(return_value, "ISOLATION_OPTION", array);
@@ -7195,7 +7188,7 @@ PHP_FUNCTION(db2_server_info)
71957188
default:
71967189
break;
71977190
}
7198-
ADD_PROPERTY_STRINGL(return_value, "SQL_CONFORMANCE", (char *)buffer255, strlen((char *)buffer255), 1);
7191+
add_property_stringl(return_value, "SQL_CONFORMANCE", (char *)buffer255, strlen((char *)buffer255));
71997192
}
72007193

72017194
/* PROCEDURES */
@@ -7223,7 +7216,7 @@ PHP_FUNCTION(db2_server_info)
72237216
RETURN_FALSE;
72247217
return;
72257218
} else {
7226-
ADD_PROPERTY_STRINGL(return_value, "IDENTIFIER_QUOTE_CHAR", (char *)buffer11, strlen((char *)buffer11), 1);
7219+
add_property_stringl(return_value, "IDENTIFIER_QUOTE_CHAR", (char *)buffer11, strlen((char *)buffer11));
72277220
}
72287221

72297222
/* LIKE_ESCAPE_CLAUSE */
@@ -7404,7 +7397,7 @@ PHP_FUNCTION(db2_client_info)
74047397
RETURN_FALSE;
74057398
return;
74067399
} else {
7407-
ADD_PROPERTY_STRINGL(return_value, "DRIVER_NAME", (char *)buffer255, strlen((char *)buffer255), 1);
7400+
add_property_stringl(return_value, "DRIVER_NAME", (char *)buffer255, strlen((char *)buffer255));
74087401
}
74097402

74107403
/* DRIVER_VER */
@@ -7416,7 +7409,7 @@ PHP_FUNCTION(db2_client_info)
74167409
RETURN_FALSE;
74177410
return;
74187411
} else {
7419-
ADD_PROPERTY_STRINGL(return_value, "DRIVER_VER", (char *)buffer255, strlen((char *)buffer255), 1);
7412+
add_property_stringl(return_value, "DRIVER_VER", (char *)buffer255, strlen((char *)buffer255));
74207413
}
74217414

74227415
/* DATA_SOURCE_NAME */
@@ -7428,7 +7421,7 @@ PHP_FUNCTION(db2_client_info)
74287421
RETURN_FALSE;
74297422
return;
74307423
} else {
7431-
ADD_PROPERTY_STRINGL(return_value, "DATA_SOURCE_NAME", (char *)buffer255, strlen((char *)buffer255), 1);
7424+
add_property_stringl(return_value, "DATA_SOURCE_NAME", (char *)buffer255, strlen((char *)buffer255));
74327425
}
74337426

74347427
/* DRIVER_ODBC_VER */
@@ -7440,7 +7433,7 @@ PHP_FUNCTION(db2_client_info)
74407433
RETURN_FALSE;
74417434
return;
74427435
} else {
7443-
ADD_PROPERTY_STRINGL(return_value, "DRIVER_ODBC_VER", (char *)buffer255, strlen((char *)buffer255), 1);
7436+
add_property_stringl(return_value, "DRIVER_ODBC_VER", (char *)buffer255, strlen((char *)buffer255));
74447437
}
74457438

74467439
#ifndef PASE /* i5/OS ODBC_VER handled natively */
@@ -7453,7 +7446,7 @@ PHP_FUNCTION(db2_client_info)
74537446
RETURN_FALSE;
74547447
return;
74557448
} else {
7456-
ADD_PROPERTY_STRINGL(return_value, "ODBC_VER", (char *)buffer255, strlen((char *)buffer255), 1);
7449+
add_property_stringl(return_value, "ODBC_VER", (char *)buffer255, strlen((char *)buffer255));
74577450
}
74587451
#endif /* PASE */
74597452

@@ -7480,7 +7473,7 @@ PHP_FUNCTION(db2_client_info)
74807473
default:
74817474
break;
74827475
}
7483-
ADD_PROPERTY_STRINGL(return_value, "ODBC_SQL_CONFORMANCE", (char *)buffer255, strlen((char *)buffer255), 1);
7476+
add_property_stringl(return_value, "ODBC_SQL_CONFORMANCE", (char *)buffer255, strlen((char *)buffer255));
74847477
}
74857478

74867479
#ifndef PASE /* i5/OS APPL_CODEPAGE handled natively */

0 commit comments

Comments
 (0)