cvs: php4(PHP_4_3) /ext/mysql php_mysql.c

georg Thu Dec 26 08:48:00 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/mysql php_mysql.c Log: fixed some compiler warnings when using external libmysqlclient 4.x Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.174.2.3 php4/ext/mysql/php_mysql.c:1.174.2.4 --- php4/ext/mysql/php_mysql.c:1.174.2.3 Thu Dec 5 15:02:21 2002 +++ php4/ext/mysql/php_mysql.c Thu Dec 26 08:47:59 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.174.2.3 2002/12/05 20:02:21 helly Exp $ */ +/* $Id: php_mysql.c,v 1.174.2.4 2002/12/26 13:47:59 georg Exp $ */ /* TODO: * @@ -889,7 +889,7 @@ WRONG_PARAM_COUNT; } - RETURN_STRING(mysql_get_client_info(),1); + RETURN_STRING((char *)mysql_get_client_info(),1); } /* }}} */ @@ -919,7 +919,7 @@ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_STRING(mysql_get_host_info(&mysql->conn),1); + RETURN_STRING((char *)mysql_get_host_info(&mysql->conn),1); } /* }}} */ @@ -979,7 +979,7 @@ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_STRING(mysql_get_server_info(&mysql->conn),1); + RETURN_STRING((char *)mysql_get_server_info(&mysql->conn),1); } /* }}} */ @@ -1003,7 +1003,7 @@ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); - if ((str = mysql_info(&mysql->conn))) { + if ((str = (char *)mysql_info(&mysql->conn))) { RETURN_STRING(str,1); } else { RETURN_FALSE; @@ -1051,7 +1051,7 @@ } ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_STRING(mysql_stat(&mysql->conn), 1); + RETURN_STRING((char *)mysql_stat(&mysql->conn), 1); } /* }}} */ @@ -1542,7 +1542,7 @@ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_STRING(mysql_error(&mysql->conn), 1); + RETURN_STRING((char *)mysql_error(&mysql->conn), 1); } /* }}} */ @@ -1857,7 +1857,6 @@ MYSQL_ROW mysql_row; MYSQL_FIELD *mysql_field; mysql_row_length_type *mysql_row_lengths; - int num_fields; int i; if (ZEND_NUM_ARGS() > expected_args) { @@ -1892,8 +1891,6 @@ RETURN_FALSE; } - num_fields = mysql_num_fields(mysql_result); - if (array_init(return_value)==FAILURE) { RETURN_FALSE; }