From 2d925fb2164d6466d7eff97b495eaa52ab0fb41a Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Mon, 4 Oct 2010 10:02:58 +0000 Subject: Sorry for the commit but compiler warnings are annoying and so are white spaces at the end of a line, if one uses an editor which removes them on save and diff's get blown up by white space changes... Changes: - remove end of line white space - fix compiler warning "ext/mysqli/mysqli_priv.h:156:27: warning: no newline at end of file" - fix compiler warning "ext/mysqli/mysqli_fe.h:135:25: warning: no newline at end of file" - fix compiler warning "ext/mysqli/mysqli.c:896:11: warning: extra tokens at end of #ifdef directive" --- ext/mysqli/mysqli_fe.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ext/mysqli/mysqli_fe.c') diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index 7838620029..d9aa7ee743 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/ext/mysqli/mysqli_fe.c @@ -17,7 +17,7 @@ | Ulf Wendel | +----------------------------------------------------------------------+ - $Id$ + $Id$ */ #ifdef HAVE_CONFIG_H @@ -362,7 +362,7 @@ const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_fetch_all, arginfo_mysqli_only_result) #endif PHP_FE(mysqli_fetch_array, arginfo_mysqli_fetch_array) - PHP_FE(mysqli_fetch_assoc, arginfo_mysqli_only_result) + PHP_FE(mysqli_fetch_assoc, arginfo_mysqli_only_result) PHP_FE(mysqli_fetch_object, arginfo_mysqli_fetch_object) PHP_FE(mysqli_fetch_row, arginfo_mysqli_only_result) PHP_FE(mysqli_field_count, arginfo_mysqli_only_link) @@ -374,7 +374,7 @@ const zend_function_entry mysqli_functions[] = { PHP_FE(mysqli_get_connection_stats, arginfo_mysqli_only_link) PHP_FE(mysqli_get_client_stats, arginfo_mysqli_no_params) #endif -#ifdef HAVE_MYSQLI_GET_CHARSET +#ifdef HAVE_MYSQLI_GET_CHARSET PHP_FE(mysqli_get_charset, arginfo_mysqli_only_link) #endif PHP_FE(mysqli_get_client_info, arginfo_mysqli_only_link) @@ -486,7 +486,7 @@ const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(connect, mysqli_connect, arginfo_mysqli_connect) PHP_FALIAS(dump_debug_info, mysqli_dump_debug_info, arginfo_mysqli_no_params) PHP_FALIAS(debug, mysqli_debug, arginfo_mysqli_debug) -#ifdef HAVE_MYSQLI_GET_CHARSET +#ifdef HAVE_MYSQLI_GET_CHARSET PHP_FALIAS(get_charset, mysqli_get_charset, arginfo_mysqli_no_params) #endif PHP_FALIAS(get_client_info, mysqli_get_client_info, arginfo_mysqli_no_params) @@ -552,8 +552,8 @@ const zend_function_entry mysqli_result_methods[] = { PHP_FALIAS(fetch_all, mysqli_fetch_all, arginfo_mysqli_no_params) #endif PHP_FALIAS(fetch_array, mysqli_fetch_array, arginfo_class_mysqli_fetch_array) - PHP_FALIAS(fetch_assoc, mysqli_fetch_assoc, arginfo_mysqli_no_params) - PHP_FALIAS(fetch_object,mysqli_fetch_object, arginfo_class_mysqli_fetch_object) + PHP_FALIAS(fetch_assoc, mysqli_fetch_assoc, arginfo_mysqli_no_params) + PHP_FALIAS(fetch_object,mysqli_fetch_object, arginfo_class_mysqli_fetch_object) PHP_FALIAS(fetch_row, mysqli_fetch_row, arginfo_mysqli_no_params) PHP_FALIAS(field_seek, mysqli_field_seek, arginfo_class_mysqli_result_and_fieldnr) PHP_FALIAS(free_result, mysqli_free_result, arginfo_mysqli_no_params) -- cgit v1.2.1