diff options
| author | foobar <sniper@php.net> | 2002-03-29 12:56:25 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-03-29 12:56:25 +0000 |
| commit | a0e3bd8f0e6cba380845ab01055adb7f3a764ec9 (patch) | |
| tree | 1215a88b8ba93be54ac40be8816ef2e7ca9f0791 /ext/mysql/php_mysql.c | |
| parent | bc19dd69005e805096078d0d20e96b7a7bde87e5 (diff) | |
| download | php-git-a0e3bd8f0e6cba380845ab01055adb7f3a764ec9.tar.gz | |
WS fix
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 95e227f72d..09107790f1 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -167,7 +167,7 @@ function_entry mysql_functions[] = { PHP_FE(mysql_get_server_info, NULL) #endif - PHP_FE(mysql_info, NULL) + PHP_FE(mysql_info, NULL) /* for downwards compatability */ PHP_FALIAS(mysql, mysql_db_query, NULL) @@ -917,20 +917,20 @@ PHP_FUNCTION(mysql_info) { zval **mysql_link; int id; - char *str; + char *str; php_mysql_conn *mysql; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { return; } - - if (ZEND_NUM_ARGS() == 0) { + + if (ZEND_NUM_ARGS() == 0) { id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); CHECK_LINK(id); } ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); - + if (str = mysql_info(&mysql->conn)) { RETURN_STRING(str,1); } else { @@ -1795,11 +1795,11 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, /* NULL value. */ if (result_type & MYSQL_NUM) { add_index_null(return_value, i); - } + } - if (result_type & MYSQL_ASSOC) { + if (result_type & MYSQL_ASSOC) { add_assoc_null(return_value, mysql_field->name); - } + } } } } @@ -1877,7 +1877,6 @@ PHP_FUNCTION(mysql_fetch_lengths) mysql_row_length_type *lengths; int num_fields; int i; - if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &result)==FAILURE) { WRONG_PARAM_COUNT; |