whitespace, braces, coding style (Mc)

1 files changed, 223 insertions, 216 deletions

diff --git a/ext/dbx/dbx_mssql.c b/ext/dbx/dbx_mssql.c
index 45ce0daf94..af66d7bbf2 100644
--- a/ext/dbx/dbx_mssql.c
+++ b/ext/dbx/dbx_mssql.c
@@ -25,222 +25,229 @@
 #include "dbx.h"
 #include "dbx_mssql.h"
 
-#define MSSQL_ASSOC		1<<0
-#define MSSQL_NUM		1<<1
-
-int dbx_mssql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns connection handle as resource on success or 0 as long on failure */
-    int number_of_arguments=3;
-    zval **arguments[3];
-    zval * returned_zval=NULL;
-    zval * select_db_zval=NULL;
-
-    arguments[0]=host;
-    arguments[1]=username;
-    arguments[2]=password;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_connect", &returned_zval, number_of_arguments, arguments);
-    if (!returned_zval || returned_zval->type!=IS_RESOURCE) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-
-    number_of_arguments=2;
-    arguments[0]=db;
-    arguments[1]=&returned_zval;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_select_db", &select_db_zval, number_of_arguments, arguments);
-    if (!select_db_zval || (select_db_zval->type==IS_BOOL && select_db_zval->value.lval==0) ) {
-        if (select_db_zval) zval_ptr_dtor(&select_db_zval);
-        /* also close connection */
-        number_of_arguments=1;
-        arguments[0]=&returned_zval;
-        zend_list_addref(returned_zval->value.lval);
-        dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_close", &select_db_zval, number_of_arguments, arguments);
-        if (select_db_zval) zval_ptr_dtor(&select_db_zval);
-        zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-    zval_ptr_dtor(&select_db_zval);
-
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-
-    return 1;
-    }
-
-int dbx_mssql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns persistent connection handle as resource on success or 0 as long on failure */
-    int number_of_arguments=3;
-    zval **arguments[3];
-    zval * returned_zval=NULL;
-    zval * select_db_zval=NULL;
-
-    arguments[0]=host;
-    arguments[1]=username;
-    arguments[2]=password;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_pconnect", &returned_zval, number_of_arguments, arguments);
-    if (!returned_zval || returned_zval->type!=IS_RESOURCE) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-
-    number_of_arguments=2;
-    arguments[0]=db;
-    arguments[1]=&returned_zval;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_select_db", &select_db_zval, number_of_arguments, arguments);
-    if (!select_db_zval || (select_db_zval->type==IS_BOOL && select_db_zval->value.lval==0) ) {
-        if (select_db_zval) zval_ptr_dtor(&select_db_zval);
-        /* also close connection */
-        number_of_arguments=1;
-        arguments[0]=&returned_zval;
-        zend_list_addref(returned_zval->value.lval);
-        dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_close", &select_db_zval, number_of_arguments, arguments);
-        if (select_db_zval) zval_ptr_dtor(&select_db_zval);
-        zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-    zval_ptr_dtor(&select_db_zval);
-
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-
-    return 1;
-    }
-
-int dbx_mssql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns 1 as long on success or 0 as long on failure */
-    int number_of_arguments=1;
-    zval **arguments[1];
-    zval * returned_zval=NULL;
-
-    arguments[0]=dbx_handle;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_close", &returned_zval, number_of_arguments, arguments);
-    if (!returned_zval || returned_zval->type!=IS_BOOL) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-    return 1;
-    }
-
-int dbx_mssql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns 1 as long or a result identifier as resource on success  or 0 as long on failure */
-    int number_of_arguments=2;
-    zval **arguments[2];
-    zval * returned_zval=NULL;
-    zval * select_db_zval=NULL;
-
-    number_of_arguments=2;
-    arguments[0]=db_name;
-    arguments[1]=dbx_handle;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_select_db", &select_db_zval, number_of_arguments, arguments);
-    zval_ptr_dtor(&select_db_zval);
-
-    number_of_arguments=2;
-    arguments[0]=sql_statement;
-    arguments[1]=dbx_handle;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_query", &returned_zval, number_of_arguments, arguments);
-    /* mssql_query returns a bool for success or failure, or a result_identifier for select statements */
-    if (!returned_zval || (returned_zval->type!=IS_BOOL && returned_zval->type!=IS_RESOURCE)) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-    return 1;
-    }
-
-int dbx_mssql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns column-count as long on success or 0 as long on failure */
-    int number_of_arguments=1;
-    zval **arguments[1];
-    zval * returned_zval=NULL;
-
-    arguments[0]=result_handle;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_num_fields", &returned_zval, number_of_arguments, arguments);
-    if (!returned_zval || returned_zval->type!=IS_LONG) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-    return 1;
-    }
-
-int dbx_mssql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns column-name as string on success or 0 as long on failure */
-    int number_of_arguments=2;
-    zval **arguments[2];
-    zval * zval_column_index;
-    zval * returned_zval=NULL;
-
-    MAKE_STD_ZVAL(zval_column_index);
-    ZVAL_LONG(zval_column_index, column_index);
-    arguments[0]=result_handle;
-    arguments[1]=&zval_column_index;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_field_name", &returned_zval, number_of_arguments, arguments);
-    /* mssql_field_name returns a string */
-    if (!returned_zval || returned_zval->type!=IS_STRING) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        FREE_ZVAL(zval_column_index);
-        return 0;
-        }
-    FREE_ZVAL(zval_column_index);
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-    return 1;
-    }
-
-int dbx_mssql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns column-type as string on success or 0 as long on failure */
-    int number_of_arguments=2;
-    zval **arguments[2];
-    zval * zval_column_index;
-    zval * returned_zval=NULL;
-
-    MAKE_STD_ZVAL(zval_column_index);
-    ZVAL_LONG(zval_column_index, column_index);
-    arguments[0]=result_handle;
-    arguments[1]=&zval_column_index;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_field_type", &returned_zval, number_of_arguments, arguments);
-    /* mssql_field_name returns a string */
-    if (!returned_zval || returned_zval->type!=IS_STRING) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        FREE_ZVAL(zval_column_index);
-        return 0;
-        }
-    FREE_ZVAL(zval_column_index);
-
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-    return 1;
-    }
-
-int dbx_mssql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns array[0..columncount-1] as strings on success or 0 as long on failure */
-    int number_of_arguments=1;
-    zval **arguments[1];
-    zval * returned_zval=NULL;
-
-    arguments[0]=result_handle;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_fetch_row", &returned_zval, number_of_arguments, arguments);
-    if (!returned_zval || returned_zval->type!=IS_ARRAY) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-    return 1;
-    }
-
-int dbx_mssql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) {
-    /* returns string */
-    int number_of_arguments=1;
-    zval **arguments[1];
-    zval * returned_zval=NULL;
-
-    arguments[0]=dbx_handle;
-    if (!dbx_handle) number_of_arguments=0;
-    dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_get_last_message", &returned_zval, number_of_arguments, arguments);
-    if (!returned_zval || returned_zval->type!=IS_STRING) {
-        if (returned_zval) zval_ptr_dtor(&returned_zval);
-        return 0;
-        }
-    MOVE_RETURNED_TO_RV(rv, returned_zval);
-    return 1;
-    }
+#define MSSQL_ASSOC    1<<0
+#define MSSQL_NUM      1<<1
+
+int dbx_mssql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns connection handle as resource on success or 0 as long on failure */
+	int number_of_arguments=3;
+	zval **arguments[3];
+	zval *returned_zval=NULL;
+	zval *select_db_zval=NULL;
+
+	arguments[0]=host;
+	arguments[1]=username;
+	arguments[2]=password;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_connect", &returned_zval, number_of_arguments, arguments);
+	if (!returned_zval || returned_zval->type!=IS_RESOURCE) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+
+	number_of_arguments=2;
+	arguments[0]=db;
+	arguments[1]=&returned_zval;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_select_db", &select_db_zval, number_of_arguments, arguments);
+	if (!select_db_zval || (select_db_zval->type==IS_BOOL && select_db_zval->value.lval==0) ) {
+		if (select_db_zval) zval_ptr_dtor(&select_db_zval);
+		/* also close connection */
+		number_of_arguments=1;
+		arguments[0]=&returned_zval;
+		zend_list_addref(returned_zval->value.lval);
+		dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_close", &select_db_zval, number_of_arguments, arguments);
+		if (select_db_zval) zval_ptr_dtor(&select_db_zval);
+		zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+	zval_ptr_dtor(&select_db_zval);
+
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns persistent connection handle as resource on success or 0 as long on failure */
+	int number_of_arguments=3;
+	zval **arguments[3];
+	zval *returned_zval=NULL;
+	zval *select_db_zval=NULL;
+
+	arguments[0]=host;
+	arguments[1]=username;
+	arguments[2]=password;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_pconnect", &returned_zval, number_of_arguments, arguments);
+	if (!returned_zval || returned_zval->type!=IS_RESOURCE) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+
+	number_of_arguments=2;
+	arguments[0]=db;
+	arguments[1]=&returned_zval;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_select_db", &select_db_zval, number_of_arguments, arguments);
+	if (!select_db_zval || (select_db_zval->type==IS_BOOL && select_db_zval->value.lval==0) ) {
+		if (select_db_zval) zval_ptr_dtor(&select_db_zval);
+		/* also close connection */
+		number_of_arguments=1;
+		arguments[0]=&returned_zval;
+		zend_list_addref(returned_zval->value.lval);
+		dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_close", &select_db_zval, number_of_arguments, arguments);
+		if (select_db_zval) zval_ptr_dtor(&select_db_zval);
+		zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+	zval_ptr_dtor(&select_db_zval);
+
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns 1 as long on success or 0 as long on failure */
+	int number_of_arguments=1;
+	zval **arguments[1];
+	zval *returned_zval=NULL;
+
+	arguments[0]=dbx_handle;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_close", &returned_zval, number_of_arguments, arguments);
+	if (!returned_zval || returned_zval->type!=IS_BOOL) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns 1 as long or a result identifier as resource on success  or 0 as long on failure */
+	int number_of_arguments=2;
+	zval **arguments[2];
+	zval *returned_zval=NULL;
+	zval *select_db_zval=NULL;
+
+	number_of_arguments=2;
+	arguments[0]=db_name;
+	arguments[1]=dbx_handle;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_select_db", &select_db_zval, number_of_arguments, arguments);
+	zval_ptr_dtor(&select_db_zval);
+
+	number_of_arguments=2;
+	arguments[0]=sql_statement;
+	arguments[1]=dbx_handle;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_query", &returned_zval, number_of_arguments, arguments);
+	/* mssql_query returns a bool for success or failure, or a result_identifier for select statements */
+	if (!returned_zval || (returned_zval->type!=IS_BOOL && returned_zval->type!=IS_RESOURCE)) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns column-count as long on success or 0 as long on failure */
+	int number_of_arguments=1;
+	zval **arguments[1];
+	zval *returned_zval=NULL;
+
+	arguments[0]=result_handle;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_num_fields", &returned_zval, number_of_arguments, arguments);
+	if (!returned_zval || returned_zval->type!=IS_LONG) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns column-name as string on success or 0 as long on failure */
+	int number_of_arguments=2;
+	zval **arguments[2];
+	zval *zval_column_index;
+	zval *returned_zval=NULL;
+
+	MAKE_STD_ZVAL(zval_column_index);
+	ZVAL_LONG(zval_column_index, column_index);
+	arguments[0]=result_handle;
+	arguments[1]=&zval_column_index;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_field_name", &returned_zval, number_of_arguments, arguments);
+	/* mssql_field_name returns a string */
+	if (!returned_zval || returned_zval->type!=IS_STRING) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		FREE_ZVAL(zval_column_index);
+		return 0;
+	}
+	FREE_ZVAL(zval_column_index);
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns column-type as string on success or 0 as long on failure */
+	int number_of_arguments=2;
+	zval **arguments[2];
+	zval *zval_column_index;
+	zval *returned_zval=NULL;
+
+	MAKE_STD_ZVAL(zval_column_index);
+	ZVAL_LONG(zval_column_index, column_index);
+	arguments[0]=result_handle;
+	arguments[1]=&zval_column_index;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_field_type", &returned_zval, number_of_arguments, arguments);
+	/* mssql_field_name returns a string */
+	if (!returned_zval || returned_zval->type!=IS_STRING) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		FREE_ZVAL(zval_column_index);
+		return 0;
+	}
+	FREE_ZVAL(zval_column_index);
+
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns array[0..columncount-1] as strings on success or 0 as long on failure */
+	int number_of_arguments=1;
+	zval **arguments[1];
+	zval *returned_zval=NULL;
+
+	arguments[0]=result_handle;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_fetch_row", &returned_zval, number_of_arguments, arguments);
+	if (!returned_zval || returned_zval->type!=IS_ARRAY) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
+
+int dbx_mssql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS)
+{
+	/* returns string */
+	int number_of_arguments=1;
+	zval **arguments[1];
+	zval *returned_zval=NULL;
+
+	arguments[0]=dbx_handle;
+	if (!dbx_handle) number_of_arguments=0;
+	dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "mssql_get_last_message", &returned_zval, number_of_arguments, arguments);
+	if (!returned_zval || returned_zval->type!=IS_STRING) {
+		if (returned_zval) zval_ptr_dtor(&returned_zval);
+		return 0;
+	}
+	MOVE_RETURNED_TO_RV(rv, returned_zval);
+	return 1;
+}
 
 /*
  * Local variables: