From 68d3353e5cf696c2679ec071683e2c7b525f2c29 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 16 Dec 2013 17:26:32 +0100 Subject: basic fixes to ext/mssql --- ext/mssql/php_mssql.c | 73 ++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index d74f0829d9..87f51a10e5 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -544,14 +544,14 @@ PHP_MINFO_FUNCTION(mssql) static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { char *host = NULL, *user = NULL, *passwd = NULL; - int host_len = 0, user_len = 0, passwd_len = 0; + zend_str_size_int host_len = 0, user_len = 0, passwd_len = 0; zend_bool new_link = 0; char *hashed_details; int hashed_details_length; mssql_link mssql, *mssql_ptr; char buffer[40]; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sssb", &host, &host_len, &user, &user_len, &passwd, &passwd_len, &new_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|SSSb", &host, &host_len, &user, &user_len, &passwd, &passwd_len, &new_link) == FAILURE) { return; } @@ -904,11 +904,11 @@ PHP_FUNCTION(mssql_select_db) { char *db; zval *mssql_link_index = NULL; - int db_len; + zend_str_size_int db_len; int id = -1; mssql_link *mssql_ptr; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mssql_link_index) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &db, &db_len, &mssql_link_index) == FAILURE) { return; } @@ -1179,8 +1179,8 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme case SQLVARCHAR: case SQLTEXT: convert_to_string_ex(&bind->zval); - Z_STRLEN_P(bind->zval) = dbretlen(mssql_ptr->link,i); - Z_STRVAL_P(bind->zval) = estrndup(dbretdata(mssql_ptr->link,i),Z_STRLEN_P(bind->zval)); + Z_STRSIZE_P(bind->zval) = dbretlen(mssql_ptr->link,i); + Z_STRVAL_P(bind->zval) = estrndup(dbretdata(mssql_ptr->link,i),Z_STRSIZE_P(bind->zval)); break; /* TODO binary */ } @@ -1325,8 +1325,9 @@ PHP_FUNCTION(mssql_query) { char *query; zval *mssql_link_index = NULL; - int query_len, retvalue, batchsize, num_fields; - long zbatchsize = 0; + zend_str_size_int query_len; + int retvalue, batchsize, num_fields; + php_int_t zbatchsize = 0; mssql_link *mssql_ptr; mssql_result *result; int id = -1; @@ -1334,7 +1335,7 @@ PHP_FUNCTION(mssql_query) dbsettime(MS_SQL_G(timeout)); batchsize = MS_SQL_G(batchsize); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|rl", &query, &query_len, &mssql_link_index, &zbatchsize) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|ri", &query, &query_len, &mssql_link_index, &zbatchsize) == FAILURE) { return; } @@ -1496,7 +1497,7 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) zval *mssql_result_index; mssql_result *result; int i; - long resulttype = 0; + php_int_t resulttype = 0; switch (result_type) { case MSSQL_NUM: @@ -1506,7 +1507,7 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) } break; case MSSQL_BOTH: - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mssql_result_index, &resulttype) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &mssql_result_index, &resulttype) == FAILURE) { return; } result_type = (resulttype > 0 && (resulttype & MSSQL_BOTH)) ? resulttype : result_type; @@ -1535,7 +1536,7 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) if (Z_TYPE(result->data[result->cur_row][i]) == IS_STRING) { data = Z_STRVAL(result->data[result->cur_row][i]); - data_len = Z_STRLEN(result->data[result->cur_row][i]); + data_len = Z_STRSIZE(result->data[result->cur_row][i]); if (result_type & MSSQL_NUM) { add_index_stringl(return_value, i, data, data_len, 1); @@ -1612,10 +1613,10 @@ PHP_FUNCTION(mssql_fetch_assoc) PHP_FUNCTION(mssql_data_seek) { zval *mssql_result_index; - long offset; + php_int_t offset; mssql_result *result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &mssql_result_index, &offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &mssql_result_index, &offset) == FAILURE) { return; } @@ -1695,10 +1696,10 @@ static char *php_mssql_get_field_name(int type) PHP_FUNCTION(mssql_fetch_field) { zval *mssql_result_index; - long field_offset = -1; + php_int_t field_offset = -1; mssql_result *result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mssql_result_index, &field_offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &mssql_result_index, &field_offset) == FAILURE) { return; } @@ -1731,10 +1732,10 @@ PHP_FUNCTION(mssql_fetch_field) PHP_FUNCTION(mssql_field_length) { zval *mssql_result_index; - long field_offset = -1; + php_int_t field_offset = -1; mssql_result *result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mssql_result_index, &field_offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &mssql_result_index, &field_offset) == FAILURE) { return; } @@ -1761,10 +1762,10 @@ PHP_FUNCTION(mssql_field_length) PHP_FUNCTION(mssql_field_name) { zval *mssql_result_index; - long field_offset = -1; + php_int_t field_offset = -1; mssql_result *result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mssql_result_index, &field_offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &mssql_result_index, &field_offset) == FAILURE) { return; } @@ -1791,10 +1792,10 @@ PHP_FUNCTION(mssql_field_name) PHP_FUNCTION(mssql_field_type) { zval *mssql_result_index; - long field_offset = -1; + php_int_t field_offset = -1; mssql_result *result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mssql_result_index, &field_offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|i", &mssql_result_index, &field_offset) == FAILURE) { return; } @@ -1821,10 +1822,10 @@ PHP_FUNCTION(mssql_field_type) PHP_FUNCTION(mssql_field_seek) { zval *mssql_result_index; - long field_offset; + php_int_t field_offset; mssql_result *result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &mssql_result_index, &field_offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri", &mssql_result_index, &field_offset) == FAILURE) { return; } @@ -1845,11 +1846,11 @@ PHP_FUNCTION(mssql_field_seek) PHP_FUNCTION(mssql_result) { zval **field, *mssql_result_index; - long row; + php_int_t row; int field_offset=0; mssql_result *result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &mssql_result_index, &row, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "riZ", &mssql_result_index, &row, &field) == FAILURE) { return; } @@ -1943,9 +1944,9 @@ PHP_FUNCTION(mssql_next_result) Sets the lower error severity */ PHP_FUNCTION(mssql_min_error_severity) { - long severity; + php_int_t severity; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &severity) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &severity) == FAILURE) { return; } @@ -1958,9 +1959,9 @@ PHP_FUNCTION(mssql_min_error_severity) Sets the lower message severity */ PHP_FUNCTION(mssql_min_message_severity) { - long severity; + php_int_t severity; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &severity) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &severity) == FAILURE) { return; } @@ -1973,13 +1974,13 @@ PHP_FUNCTION(mssql_min_message_severity) PHP_FUNCTION(mssql_init) { char *sp_name; - int sp_name_len; + zend_str_size_int sp_name_len; zval *mssql_link_index = NULL; mssql_link *mssql_ptr; mssql_statement *statement; int id = -1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &sp_name, &sp_name_len, &mssql_link_index) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|r", &sp_name, &sp_name_len, &mssql_link_index) == FAILURE) { return; } @@ -2011,9 +2012,9 @@ PHP_FUNCTION(mssql_init) PHP_FUNCTION(mssql_bind) { char *param_name; - int param_name_len, datalen; + zend_str_size_int param_name_len, datalen; int status = 0; - long type = 0, maxlen = -1; + php_int_t type = 0, maxlen = -1; zval *stmt, **var; zend_bool is_output = 0, is_null = 0; mssql_link *mssql_ptr; @@ -2021,7 +2022,7 @@ PHP_FUNCTION(mssql_bind) mssql_bind bind,*bindp; LPBYTE value = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsZl|bbl", &stmt, ¶m_name, ¶m_name_len, &var, &type, &is_output, &is_null, &maxlen) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rSZi|bbi", &stmt, ¶m_name, ¶m_name_len, &var, &type, &is_output, &is_null, &maxlen) == FAILURE) { return; } @@ -2043,7 +2044,7 @@ PHP_FUNCTION(mssql_bind) datalen=0; } else { convert_to_string_ex(var); - datalen=Z_STRLEN_PP(var); + datalen=Z_STRSIZE_PP(var); value=(LPBYTE)Z_STRVAL_PP(var); } } else { -- cgit v1.2.1 From b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 18 Dec 2013 14:46:44 -0800 Subject: mass replacement for zend_size_t/php_size_t --- ext/mssql/php_mssql.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 87f51a10e5..676fa443df 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -544,7 +544,7 @@ PHP_MINFO_FUNCTION(mssql) static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { char *host = NULL, *user = NULL, *passwd = NULL; - zend_str_size_int host_len = 0, user_len = 0, passwd_len = 0; + php_size_t host_len = 0, user_len = 0, passwd_len = 0; zend_bool new_link = 0; char *hashed_details; int hashed_details_length; @@ -904,7 +904,7 @@ PHP_FUNCTION(mssql_select_db) { char *db; zval *mssql_link_index = NULL; - zend_str_size_int db_len; + php_size_t db_len; int id = -1; mssql_link *mssql_ptr; @@ -1325,7 +1325,7 @@ PHP_FUNCTION(mssql_query) { char *query; zval *mssql_link_index = NULL; - zend_str_size_int query_len; + php_size_t query_len; int retvalue, batchsize, num_fields; php_int_t zbatchsize = 0; mssql_link *mssql_ptr; @@ -1974,7 +1974,7 @@ PHP_FUNCTION(mssql_min_message_severity) PHP_FUNCTION(mssql_init) { char *sp_name; - zend_str_size_int sp_name_len; + php_size_t sp_name_len; zval *mssql_link_index = NULL; mssql_link *mssql_ptr; mssql_statement *statement; @@ -2012,7 +2012,7 @@ PHP_FUNCTION(mssql_init) PHP_FUNCTION(mssql_bind) { char *param_name; - zend_str_size_int param_name_len, datalen; + php_size_t param_name_len, datalen; int status = 0; php_int_t type = 0, maxlen = -1; zval *stmt, **var; -- cgit v1.2.1 From f58d0b35edf25a8f39fad6bd5e0e4eeb5cdfe9a7 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 05:07:37 -0800 Subject: massive update semantical LONG vs INT replacements --- ext/mssql/php_mssql.c | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 676fa443df..c740aade20 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -449,20 +449,20 @@ PHP_MINIT_FUNCTION(mssql) } /* BEGIN MSSQL data types for mssql_bind */ - REGISTER_LONG_CONSTANT("MSSQL_ASSOC", MSSQL_ASSOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MSSQL_NUM", MSSQL_NUM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MSSQL_BOTH", MSSQL_BOTH, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("SQLTEXT",SQLTEXT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLVARCHAR",SQLVARCHAR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLCHAR",SQLCHAR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLINT1",SQLINT1, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLINT2",SQLINT2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLINT4",SQLINT4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLBIT",SQLBIT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLFLT4",SQLFLT4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLFLT8",SQLFLT8, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLFLTN",SQLFLTN, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MSSQL_ASSOC", MSSQL_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MSSQL_NUM", MSSQL_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MSSQL_BOTH", MSSQL_BOTH, CONST_CS | CONST_PERSISTENT); + + REGISTER_INT_CONSTANT("SQLTEXT",SQLTEXT, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLVARCHAR",SQLVARCHAR, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLCHAR",SQLCHAR, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLINT1",SQLINT1, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLINT2",SQLINT2, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLINT4",SQLINT4, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLBIT",SQLBIT, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLFLT4",SQLFLT4, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLFLT8",SQLFLT8, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLFLTN",SQLFLTN, CONST_CS | CONST_PERSISTENT); /* END MSSQL data types for mssql_bind */ return SUCCESS; @@ -773,7 +773,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==le_link || type==le_plink)) { zend_list_addref(link); - Z_LVAL_P(return_value) = link; + Z_IVAL_P(return_value) = link; php_mssql_set_default_link(link TSRMLS_CC); Z_TYPE_P(return_value) = IS_RESOURCE; dbfreelogin(mssql.login); @@ -828,7 +828,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) ZEND_REGISTER_RESOURCE(return_value, mssql_ptr, le_link); /* add it to the hash */ - new_index_ptr.ptr = (void *) Z_LVAL_P(return_value); + new_index_ptr.ptr = (void *) Z_IVAL_P(return_value); Z_TYPE(new_index_ptr) = le_index_ptr; if (zend_hash_update(&EG(regular_list), hashed_details, hashed_details_length + 1,(void *) &new_index_ptr, sizeof(zend_rsrc_list_entry),NULL)==FAILURE) { efree(hashed_details); @@ -837,7 +837,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) MS_SQL_G(num_links)++; } efree(hashed_details); - php_mssql_set_default_link(Z_LVAL_P(return_value) TSRMLS_CC); + php_mssql_set_default_link(Z_IVAL_P(return_value) TSRMLS_CC); } /* }}} */ @@ -944,7 +944,7 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off case SQLINT2: case SQLINT4: case SQLINTN: { - ZVAL_LONG(result, (long) anyintcol(offset)); + ZVAL_INT(result, (long) anyintcol(offset)); break; } case SQLCHAR: @@ -1160,9 +1160,9 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme case SQLINT1: case SQLINT2: case SQLINT4: - convert_to_long_ex(&bind->zval); + convert_to_int_ex(&bind->zval); /* FIXME this works only on little endian machine !!! */ - Z_LVAL_P(bind->zval) = *((int *)(dbretdata(mssql_ptr->link,i))); + Z_IVAL_P(bind->zval) = *((int *)(dbretdata(mssql_ptr->link,i))); break; case SQLFLT4: @@ -1195,8 +1195,8 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme if (statement->binds != NULL) { /* Maybe a non-parameter sp */ if (zend_hash_find(statement->binds, "RETVAL", 6, (void**)&bind)==SUCCESS) { if (dbhasretstat(mssql_ptr->link)) { - convert_to_long_ex(&bind->zval); - Z_LVAL_P(bind->zval)=dbretstatus(mssql_ptr->link); + convert_to_int_ex(&bind->zval); + Z_IVAL_P(bind->zval)=dbretstatus(mssql_ptr->link); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored procedure has no return value. Nothing was returned into RETVAL"); @@ -1315,7 +1315,7 @@ PHP_FUNCTION(mssql_fetch_batch) result->cur_row=result->num_rows=0; result->num_rows = _mssql_fetch_batch(mssql_ptr, result, result->lastresult TSRMLS_CC); - RETURN_LONG(result->num_rows); + RETURN_INT(result->num_rows); } /* }}} */ @@ -1408,7 +1408,7 @@ PHP_FUNCTION(mssql_rows_affected) ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, &mssql_link_index, -1, "MS SQL-Link", le_link, le_plink); - RETURN_LONG(DBCOUNT(mssql_ptr->link)); + RETURN_INT(DBCOUNT(mssql_ptr->link)); } /* }}} */ @@ -1469,7 +1469,7 @@ PHP_FUNCTION(mssql_num_rows) ZEND_FETCH_RESOURCE(result, mssql_result *, &mssql_result_index, -1, "MS SQL-result", le_result); - RETURN_LONG(result->num_rows); + RETURN_INT(result->num_rows); } /* }}} */ @@ -1486,7 +1486,7 @@ PHP_FUNCTION(mssql_num_fields) ZEND_FETCH_RESOURCE(result, mssql_result *, &mssql_result_index, -1, "MS SQL-result", le_result); - RETURN_LONG(result->num_fields); + RETURN_INT(result->num_fields); } /* }}} */ @@ -1546,12 +1546,12 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) add_assoc_stringl(return_value, result->fields[i].name, data, data_len, 1); } } - else if (Z_TYPE(result->data[result->cur_row][i]) == IS_LONG) { + else if (Z_TYPE(result->data[result->cur_row][i]) == IS_INT) { if (result_type & MSSQL_NUM) - add_index_long(return_value, i, Z_LVAL(result->data[result->cur_row][i])); + add_index_long(return_value, i, Z_IVAL(result->data[result->cur_row][i])); if (result_type & MSSQL_ASSOC) - add_assoc_long(return_value, result->fields[i].name, Z_LVAL(result->data[result->cur_row][i])); + add_assoc_int(return_value, result->fields[i].name, Z_IVAL(result->data[result->cur_row][i])); } else if (Z_TYPE(result->data[result->cur_row][i]) == IS_DOUBLE) { if (result_type & MSSQL_NUM) @@ -1720,9 +1720,9 @@ PHP_FUNCTION(mssql_fetch_field) object_init(return_value); add_property_string(return_value, "name",result->fields[field_offset].name, 1); - add_property_long(return_value, "max_length",result->fields[field_offset].max_length); + add_property_int(return_value, "max_length",result->fields[field_offset].max_length); add_property_string(return_value, "column_source",result->fields[field_offset].column_source, 1); - add_property_long(return_value, "numeric", result->fields[field_offset].numeric); + add_property_int(return_value, "numeric", result->fields[field_offset].numeric); add_property_string(return_value, "type", php_mssql_get_field_name(Z_TYPE(result->fields[field_offset])), 1); } /* }}} */ @@ -1753,7 +1753,7 @@ PHP_FUNCTION(mssql_field_length) RETURN_FALSE; } - RETURN_LONG(result->fields[field_offset].max_length); + RETURN_INT(result->fields[field_offset].max_length); } /* }}} */ @@ -1878,8 +1878,8 @@ PHP_FUNCTION(mssql_result) break; } default: - convert_to_long_ex(field); - field_offset = Z_LVAL_PP(field); + convert_to_int_ex(field); + field_offset = Z_IVAL_PP(field); if (field_offset<0 || field_offset>=result->num_fields) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset specified"); RETURN_FALSE; @@ -2068,8 +2068,8 @@ PHP_FUNCTION(mssql_bind) case SQLINT1: case SQLINT2: case SQLINT4: - convert_to_long_ex(var); - value=(LPBYTE)(&Z_LVAL_PP(var)); + convert_to_int_ex(var); + value=(LPBYTE)(&Z_IVAL_PP(var)); break; default: -- cgit v1.2.1 From 6125278290aa3ab2ac0a1ad22116b9d363b3e915 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 08:40:41 -0800 Subject: more semantical replacements LONG vs. INT --- ext/mssql/php_mssql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index c740aade20..11b81e0fa1 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -1548,7 +1548,7 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) } else if (Z_TYPE(result->data[result->cur_row][i]) == IS_INT) { if (result_type & MSSQL_NUM) - add_index_long(return_value, i, Z_IVAL(result->data[result->cur_row][i])); + add_index_int(return_value, i, Z_IVAL(result->data[result->cur_row][i])); if (result_type & MSSQL_ASSOC) add_assoc_int(return_value, result->fields[i].name, Z_IVAL(result->data[result->cur_row][i])); -- cgit v1.2.1 From f2fc935502b110b7a706d1641c000a9e9500315b Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 23:28:52 -0800 Subject: next wave on semantical replacements long vs. int --- ext/mssql/php_mssql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 11b81e0fa1..8673bff405 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -424,7 +424,7 @@ static PHP_GINIT_FUNCTION(mssql) mssql_globals->num_persistent = 0; mssql_globals->get_column_content = php_mssql_get_column_content_with_type; - if (cfg_get_long("mssql.compatibility_mode", &compatibility_mode) == SUCCESS) { + if (cfg_get_int("mssql.compatibility_mode", &compatibility_mode) == SUCCESS) { if (compatibility_mode) { mssql_globals->get_column_content = php_mssql_get_column_content_without_type; } -- cgit v1.2.1 From 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 08:07:31 +0200 Subject: basic macro replacements, all at once --- ext/mssql/php_mssql.c | 82 +++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'ext/mssql/php_mssql.c') diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 340f55b421..03dbeca61c 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -424,7 +424,7 @@ static PHP_GINIT_FUNCTION(mssql) mssql_globals->num_persistent = 0; mssql_globals->get_column_content = php_mssql_get_column_content_with_type; - if (cfg_get_long("mssql.compatibility_mode", &compatibility_mode) == SUCCESS) { + if (cfg_get_int("mssql.compatibility_mode", &compatibility_mode) == SUCCESS) { if (compatibility_mode) { mssql_globals->get_column_content = php_mssql_get_column_content_without_type; } @@ -449,20 +449,20 @@ PHP_MINIT_FUNCTION(mssql) } /* BEGIN MSSQL data types for mssql_bind */ - REGISTER_LONG_CONSTANT("MSSQL_ASSOC", MSSQL_ASSOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MSSQL_NUM", MSSQL_NUM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MSSQL_BOTH", MSSQL_BOTH, CONST_CS | CONST_PERSISTENT); - - REGISTER_LONG_CONSTANT("SQLTEXT",SQLTEXT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLVARCHAR",SQLVARCHAR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLCHAR",SQLCHAR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLINT1",SQLINT1, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLINT2",SQLINT2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLINT4",SQLINT4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLBIT",SQLBIT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLFLT4",SQLFLT4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLFLT8",SQLFLT8, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("SQLFLTN",SQLFLTN, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MSSQL_ASSOC", MSSQL_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MSSQL_NUM", MSSQL_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MSSQL_BOTH", MSSQL_BOTH, CONST_CS | CONST_PERSISTENT); + + REGISTER_INT_CONSTANT("SQLTEXT",SQLTEXT, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLVARCHAR",SQLVARCHAR, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLCHAR",SQLCHAR, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLINT1",SQLINT1, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLINT2",SQLINT2, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLINT4",SQLINT4, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLBIT",SQLBIT, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLFLT4",SQLFLT4, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLFLT8",SQLFLT8, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("SQLFLTN",SQLFLTN, CONST_CS | CONST_PERSISTENT); /* END MSSQL data types for mssql_bind */ return SUCCESS; @@ -773,7 +773,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==le_link || type==le_plink)) { zend_list_addref(link); - Z_LVAL_P(return_value) = link; + Z_IVAL_P(return_value) = link; php_mssql_set_default_link(link TSRMLS_CC); Z_TYPE_P(return_value) = IS_RESOURCE; dbfreelogin(mssql.login); @@ -828,7 +828,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) ZEND_REGISTER_RESOURCE(return_value, mssql_ptr, le_link); /* add it to the hash */ - new_index_ptr.ptr = (void *) Z_LVAL_P(return_value); + new_index_ptr.ptr = (void *) Z_IVAL_P(return_value); Z_TYPE(new_index_ptr) = le_index_ptr; if (zend_hash_update(&EG(regular_list), hashed_details, hashed_details_length + 1,(void *) &new_index_ptr, sizeof(zend_rsrc_list_entry),NULL)==FAILURE) { efree(hashed_details); @@ -837,7 +837,7 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) MS_SQL_G(num_links)++; } efree(hashed_details); - php_mssql_set_default_link(Z_LVAL_P(return_value) TSRMLS_CC); + php_mssql_set_default_link(Z_IVAL_P(return_value) TSRMLS_CC); } /* }}} */ @@ -944,7 +944,7 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off case SQLINT2: case SQLINT4: case SQLINTN: { - ZVAL_LONG(result, (long) anyintcol(offset)); + ZVAL_INT(result, (long) anyintcol(offset)); break; } case SQLCHAR: @@ -1160,9 +1160,9 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme case SQLINT1: case SQLINT2: case SQLINT4: - convert_to_long_ex(&bind->zval); + convert_to_int_ex(&bind->zval); /* FIXME this works only on little endian machine !!! */ - Z_LVAL_P(bind->zval) = *((int *)(dbretdata(mssql_ptr->link,i))); + Z_IVAL_P(bind->zval) = *((int *)(dbretdata(mssql_ptr->link,i))); break; case SQLFLT4: @@ -1179,8 +1179,8 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme case SQLVARCHAR: case SQLTEXT: convert_to_string_ex(&bind->zval); - Z_STRLEN_P(bind->zval) = dbretlen(mssql_ptr->link,i); - Z_STRVAL_P(bind->zval) = estrndup(dbretdata(mssql_ptr->link,i),Z_STRLEN_P(bind->zval)); + Z_STRSIZE_P(bind->zval) = dbretlen(mssql_ptr->link,i); + Z_STRVAL_P(bind->zval) = estrndup(dbretdata(mssql_ptr->link,i),Z_STRSIZE_P(bind->zval)); break; /* TODO binary */ } @@ -1195,8 +1195,8 @@ static void _mssql_get_sp_result(mssql_link *mssql_ptr, mssql_statement *stateme if (statement->binds != NULL) { /* Maybe a non-parameter sp */ if (zend_hash_find(statement->binds, "RETVAL", 6, (void**)&bind)==SUCCESS) { if (dbhasretstat(mssql_ptr->link)) { - convert_to_long_ex(&bind->zval); - Z_LVAL_P(bind->zval)=dbretstatus(mssql_ptr->link); + convert_to_int_ex(&bind->zval); + Z_IVAL_P(bind->zval)=dbretstatus(mssql_ptr->link); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored procedure has no return value. Nothing was returned into RETVAL"); @@ -1315,7 +1315,7 @@ PHP_FUNCTION(mssql_fetch_batch) result->cur_row=result->num_rows=0; result->num_rows = _mssql_fetch_batch(mssql_ptr, result, result->lastresult TSRMLS_CC); - RETURN_LONG(result->num_rows); + RETURN_INT(result->num_rows); } /* }}} */ @@ -1407,7 +1407,7 @@ PHP_FUNCTION(mssql_rows_affected) ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, &mssql_link_index, -1, "MS SQL-Link", le_link, le_plink); - RETURN_LONG(DBCOUNT(mssql_ptr->link)); + RETURN_INT(DBCOUNT(mssql_ptr->link)); } /* }}} */ @@ -1468,7 +1468,7 @@ PHP_FUNCTION(mssql_num_rows) ZEND_FETCH_RESOURCE(result, mssql_result *, &mssql_result_index, -1, "MS SQL-result", le_result); - RETURN_LONG(result->num_rows); + RETURN_INT(result->num_rows); } /* }}} */ @@ -1485,7 +1485,7 @@ PHP_FUNCTION(mssql_num_fields) ZEND_FETCH_RESOURCE(result, mssql_result *, &mssql_result_index, -1, "MS SQL-result", le_result); - RETURN_LONG(result->num_fields); + RETURN_INT(result->num_fields); } /* }}} */ @@ -1535,7 +1535,7 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) if (Z_TYPE(result->data[result->cur_row][i]) == IS_STRING) { data = Z_STRVAL(result->data[result->cur_row][i]); - data_len = Z_STRLEN(result->data[result->cur_row][i]); + data_len = Z_STRSIZE(result->data[result->cur_row][i]); if (result_type & MSSQL_NUM) { add_index_stringl(return_value, i, data, data_len); @@ -1545,12 +1545,12 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) add_assoc_stringl(return_value, result->fields[i].name, data, data_len); } } - else if (Z_TYPE(result->data[result->cur_row][i]) == IS_LONG) { + else if (Z_TYPE(result->data[result->cur_row][i]) == IS_INT) { if (result_type & MSSQL_NUM) - add_index_long(return_value, i, Z_LVAL(result->data[result->cur_row][i])); + add_index_int(return_value, i, Z_IVAL(result->data[result->cur_row][i])); if (result_type & MSSQL_ASSOC) - add_assoc_long(return_value, result->fields[i].name, Z_LVAL(result->data[result->cur_row][i])); + add_assoc_int(return_value, result->fields[i].name, Z_IVAL(result->data[result->cur_row][i])); } else if (Z_TYPE(result->data[result->cur_row][i]) == IS_DOUBLE) { if (result_type & MSSQL_NUM) @@ -1719,9 +1719,9 @@ PHP_FUNCTION(mssql_fetch_field) object_init(return_value); add_property_string(return_value, "name",result->fields[field_offset].name); - add_property_long(return_value, "max_length",result->fields[field_offset].max_length); + add_property_int(return_value, "max_length",result->fields[field_offset].max_length); add_property_string(return_value, "column_source",result->fields[field_offset].column_source); - add_property_long(return_value, "numeric", result->fields[field_offset].numeric); + add_property_int(return_value, "numeric", result->fields[field_offset].numeric); add_property_string(return_value, "type", php_mssql_get_field_name(Z_TYPE(result->fields[field_offset]))); } /* }}} */ @@ -1752,7 +1752,7 @@ PHP_FUNCTION(mssql_field_length) RETURN_FALSE; } - RETURN_LONG(result->fields[field_offset].max_length); + RETURN_INT(result->fields[field_offset].max_length); } /* }}} */ @@ -1877,8 +1877,8 @@ PHP_FUNCTION(mssql_result) break; } default: - convert_to_long_ex(field); - field_offset = Z_LVAL_PP(field); + convert_to_int_ex(field); + field_offset = Z_IVAL_PP(field); if (field_offset<0 || field_offset>=result->num_fields) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset specified"); RETURN_FALSE; @@ -2043,7 +2043,7 @@ PHP_FUNCTION(mssql_bind) datalen=0; } else { convert_to_string_ex(var); - datalen=Z_STRLEN_PP(var); + datalen=Z_STRSIZE_PP(var); value=(LPBYTE)Z_STRVAL_PP(var); } } else { @@ -2067,8 +2067,8 @@ PHP_FUNCTION(mssql_bind) case SQLINT1: case SQLINT2: case SQLINT4: - convert_to_long_ex(var); - value=(LPBYTE)(&Z_LVAL_PP(var)); + convert_to_int_ex(var); + value=(LPBYTE)(&Z_IVAL_PP(var)); break; default: -- cgit v1.2.1