]> granicus.if.org Git - php/commitdiff
And strip trailing tabs too...
authorChristopher Jones <sixd@php.net>
Mon, 24 Sep 2018 06:38:39 +0000 (16:38 +1000)
committerChristopher Jones <sixd@php.net>
Mon, 24 Sep 2018 06:38:39 +0000 (16:38 +1000)
151 files changed:
ext/oci8/oci8.c
ext/oci8/oci8_collection.c
ext/oci8/oci8_interface.c
ext/oci8/oci8_lob.c
ext/oci8/oci8_statement.c
ext/oci8/tests/array_bind_001.phpt
ext/oci8/tests/array_bind_002.phpt
ext/oci8/tests/array_bind_003.phpt
ext/oci8/tests/array_bind_004.phpt
ext/oci8/tests/array_bind_005.phpt
ext/oci8/tests/array_bind_006.phpt
ext/oci8/tests/array_bind_007.phpt
ext/oci8/tests/array_bind_008.phpt
ext/oci8/tests/array_bind_009.phpt
ext/oci8/tests/array_bind_010.phpt
ext/oci8/tests/array_bind_011.phpt
ext/oci8/tests/array_bind_012.phpt
ext/oci8/tests/array_bind_013.phpt
ext/oci8/tests/array_bind_014.phpt
ext/oci8/tests/array_bind_date.phpt
ext/oci8/tests/array_bind_date1.phpt
ext/oci8/tests/array_bind_float.phpt
ext/oci8/tests/array_bind_float1.phpt
ext/oci8/tests/array_bind_int.phpt
ext/oci8/tests/array_bind_int1.phpt
ext/oci8/tests/array_bind_str.phpt
ext/oci8/tests/array_bind_str1.phpt
ext/oci8/tests/bind_char_1.phpt
ext/oci8/tests/bind_char_1_11gR1.phpt
ext/oci8/tests/bind_char_2.phpt
ext/oci8/tests/bind_char_2_11gR1.phpt
ext/oci8/tests/bind_char_3_11gR1.phpt
ext/oci8/tests/bind_char_4.phpt
ext/oci8/tests/bind_char_4_11gR1.phpt
ext/oci8/tests/bug27303_1.phpt
ext/oci8/tests/bug27303_1_11gR1.phpt
ext/oci8/tests/bug27303_2.phpt
ext/oci8/tests/bug27303_2_11gR1.phpt
ext/oci8/tests/bug27303_3.phpt
ext/oci8/tests/bug27303_4.phpt
ext/oci8/tests/bug27303_4_11gR1.phpt
ext/oci8/tests/bug32325.phpt
ext/oci8/tests/bug35973.phpt
ext/oci8/tests/bug36010.phpt
ext/oci8/tests/bug37220.phpt
ext/oci8/tests/bug37581.phpt
ext/oci8/tests/bug38161.phpt
ext/oci8/tests/bug40078.phpt
ext/oci8/tests/bug41069.phpt
ext/oci8/tests/bug43497.phpt
ext/oci8/tests/bug51253.phpt
ext/oci8/tests/bug71600.phpt
ext/oci8/tests/close.phpt
ext/oci8/tests/coll_009.phpt
ext/oci8/tests/coll_009_func.phpt
ext/oci8/tests/coll_010.phpt
ext/oci8/tests/coll_010_func.phpt
ext/oci8/tests/coll_011.phpt
ext/oci8/tests/coll_011_func.phpt
ext/oci8/tests/coll_012.phpt
ext/oci8/tests/coll_012_func.phpt
ext/oci8/tests/coll_013.phpt
ext/oci8/tests/coll_013_func.phpt
ext/oci8/tests/coll_014.phpt
ext/oci8/tests/coll_014_func.phpt
ext/oci8/tests/coll_015.phpt
ext/oci8/tests/coll_015_func.phpt
ext/oci8/tests/coll_016.phpt
ext/oci8/tests/coll_016_func.phpt
ext/oci8/tests/coll_017.phpt
ext/oci8/tests/coll_017_func.phpt
ext/oci8/tests/commit_001.phpt
ext/oci8/tests/commit_old.phpt
ext/oci8/tests/conn_attr_4.phpt
ext/oci8/tests/connect.phpt
ext/oci8/tests/connect_old.phpt
ext/oci8/tests/connect_scope1.phpt
ext/oci8/tests/connect_scope2.phpt
ext/oci8/tests/connect_scope_try1.phpt
ext/oci8/tests/connect_scope_try2.phpt
ext/oci8/tests/connect_scope_try3.phpt
ext/oci8/tests/connect_scope_try4.phpt
ext/oci8/tests/connect_scope_try5.phpt
ext/oci8/tests/connect_scope_try6.phpt
ext/oci8/tests/connect_with_charset_001.phpt
ext/oci8/tests/connect_without_oracle_home.phpt
ext/oci8/tests/connect_without_oracle_home_11.phpt
ext/oci8/tests/connect_without_oracle_home_old.phpt
ext/oci8/tests/connect_without_oracle_home_old_11.phpt
ext/oci8/tests/debug.phpt
ext/oci8/tests/default_prefetch.phpt
ext/oci8/tests/default_prefetch0.phpt
ext/oci8/tests/default_prefetch1.phpt
ext/oci8/tests/default_prefetch2.phpt
ext/oci8/tests/define2.phpt
ext/oci8/tests/define3.phpt
ext/oci8/tests/descriptors.phpt
ext/oci8/tests/edition_2.phpt
ext/oci8/tests/exec_fetch.phpt
ext/oci8/tests/execute_mode.phpt
ext/oci8/tests/fetch.phpt
ext/oci8/tests/fetch_all.phpt
ext/oci8/tests/fetch_all1.phpt
ext/oci8/tests/fetch_all2.phpt
ext/oci8/tests/fetch_array.phpt
ext/oci8/tests/fetch_into1.phpt
ext/oci8/tests/fetch_into2.phpt
ext/oci8/tests/lob_001.phpt
ext/oci8/tests/lob_003.phpt
ext/oci8/tests/lob_004.phpt
ext/oci8/tests/lob_005.phpt
ext/oci8/tests/lob_006.phpt
ext/oci8/tests/lob_007.phpt
ext/oci8/tests/lob_008.phpt
ext/oci8/tests/lob_009.phpt
ext/oci8/tests/lob_010.phpt
ext/oci8/tests/lob_011.phpt
ext/oci8/tests/lob_012.phpt
ext/oci8/tests/lob_013.phpt
ext/oci8/tests/lob_014.phpt
ext/oci8/tests/lob_015.phpt
ext/oci8/tests/lob_016.phpt
ext/oci8/tests/lob_017.phpt
ext/oci8/tests/lob_018.phpt
ext/oci8/tests/lob_019.phpt
ext/oci8/tests/lob_020.phpt
ext/oci8/tests/lob_021.phpt
ext/oci8/tests/lob_022.phpt
ext/oci8/tests/lob_023.phpt
ext/oci8/tests/lob_024.phpt
ext/oci8/tests/lob_025.phpt
ext/oci8/tests/lob_026.phpt
ext/oci8/tests/lob_027.phpt
ext/oci8/tests/lob_031.phpt
ext/oci8/tests/lob_032.phpt
ext/oci8/tests/lob_033.phpt
ext/oci8/tests/lob_034.phpt
ext/oci8/tests/lob_035.phpt
ext/oci8/tests/lob_042.phpt
ext/oci8/tests/lob_044.phpt
ext/oci8/tests/lob_temp.phpt
ext/oci8/tests/lob_temp1.phpt
ext/oci8/tests/pecl_bug10194.phpt
ext/oci8/tests/persistent.phpt
ext/oci8/tests/prefetch_old.phpt
ext/oci8/tests/privileged_connect.phpt
ext/oci8/tests/privileged_connect1.phpt
ext/oci8/tests/select_null.phpt
ext/oci8/tests/serverversion.phpt
ext/oci8/tests/statement_cache.phpt
ext/oci8/tests/uncommitted.phpt

index 4543974aab26d8a3d85257ab18d0dca4503ff9e7..e0d55aeaad1f712a76c532e5d05463e2006f9f48 100644 (file)
@@ -1872,7 +1872,7 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char
                                                                if ((tmp_val != NULL) && (Z_TYPE_P(tmp_val) == IS_RESOURCE)) {
                                                                        tmp = Z_RES_VAL_P(tmp_val);
                                                                }
-                                                       
+
                                                                if ((tmp_val != NULL) && (tmp != NULL) &&
                                                                        (ZSTR_LEN(tmp->hash_key) == ZSTR_LEN(hashed_details.s)) &&
                                                                        (memcmp(ZSTR_VAL(tmp->hash_key), ZSTR_VAL(hashed_details.s),
index 6cf471272dd55c3e8196a05ef8bbfe37899b9288..3744a84b9b71f99a917711f54abc3898acddabf6 100644 (file)
 /* {{{ php_oci_collection_create()
  Create and return connection handle */
 php_oci_collection *php_oci_collection_create(php_oci_connection *connection, char *tdo, int tdo_len, char *schema, int schema_len)
-{      
+{
        dvoid *dschp1 = NULL;
        dvoid *parmp1;
        dvoid *parmp2;
        php_oci_collection *collection;
        sword errstatus;
-       
+
        collection = emalloc(sizeof(php_oci_collection));
 
        collection->connection = connection;
@@ -195,7 +195,7 @@ php_oci_collection *php_oci_collection_create(php_oci_connection *connection, ch
                default:
                        php_error_docref(NULL, E_WARNING, "unknown collection type %d", collection->coll_typecode);
                        break;
-       }       
+       }
 
        /* Create object to hold return table */
        PHP_OCI_CALL_RETURN(errstatus, OCIObjectNew,
@@ -221,7 +221,7 @@ php_oci_collection *php_oci_collection_create(php_oci_connection *connection, ch
        PHP_OCI_REGISTER_RESOURCE(collection, le_collection);
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        return collection;
-       
+
 CLEANUP:
 
        if (dschp1) {
@@ -230,7 +230,7 @@ CLEANUP:
        }
        connection->errcode = php_oci_error(connection->err, errstatus);
        PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
-       php_oci_collection_close(collection);   
+       php_oci_collection_close(collection);
        return NULL;
 }
 /* }}} */
@@ -241,7 +241,7 @@ int php_oci_collection_size(php_oci_collection *collection, sb4 *size)
 {
        php_oci_connection *connection = collection->connection;
        sword errstatus;
-       
+
        PHP_OCI_CALL_RETURN(errstatus, OCICollSize, (connection->env, connection->err, collection->collection, (sb4 *)size));
 
        if (errstatus != OCI_SUCCESS) {
@@ -259,7 +259,7 @@ int php_oci_collection_size(php_oci_collection *collection, sb4 *size)
 int php_oci_collection_max(php_oci_collection *collection, zend_long *max)
 {
        php_oci_connection *connection = collection->connection;
-       
+
        PHP_OCI_CALL_RETURN(*max, OCICollMax, (connection->env, collection->collection));
 
        /* error handling is not necessary here? */
@@ -296,7 +296,7 @@ int php_oci_collection_append_null(php_oci_collection *collection)
 
        /* append NULL element */
        PHP_OCI_CALL_RETURN(errstatus, OCICollAppend, (connection->env, connection->err, (dvoid *)0, &null_index, collection->collection));
-       
+
        if (errstatus != OCI_SUCCESS) {
                errstatus = php_oci_error(connection->err, errstatus);
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -341,7 +341,7 @@ int php_oci_collection_append_date(php_oci_collection *collection, char *date, i
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                return 1;
        }
-                       
+
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        return 0;
 }
@@ -358,7 +358,7 @@ int php_oci_collection_append_number(php_oci_collection *collection, char *numbe
        sword errstatus;
 
        element_double = zend_strtod(number, NULL);
-                       
+
        PHP_OCI_CALL_RETURN(errstatus, OCINumberFromReal, (connection->err, &element_double, sizeof(double), &oci_number));
 
        if (errstatus != OCI_SUCCESS) {
@@ -396,7 +396,7 @@ int php_oci_collection_append_string(php_oci_collection *collection, char *eleme
        OCIString *ocistr = (OCIString *)0;
        php_oci_connection *connection = collection->connection;
        sword errstatus;
-                       
+
        PHP_OCI_CALL_RETURN(errstatus, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element, element_len, &ocistr));
 
        if (errstatus != OCI_SUCCESS) {
@@ -433,12 +433,12 @@ int php_oci_collection_append(php_oci_collection *collection, char *element, int
        if (element_len == 0) {
                return php_oci_collection_append_null(collection);
        }
-       
+
        switch(collection->element_typecode) {
                case OCI_TYPECODE_DATE:
                        return php_oci_collection_append_date(collection, element, element_len);
                        break;
-                       
+
                case OCI_TYPECODE_VARCHAR2 :
                        return php_oci_collection_append_string(collection, element, element_len);
                        break;
@@ -478,7 +478,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
        oratext buff[1024];
        ub4 buff_len = 1024;
        sword errstatus;
-       
+
        ZVAL_NULL(result_element);
 
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
@@ -500,7 +500,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                return 1;
        }
-       
+
        if (exists == 0) {
                /* element doesn't exist */
                return 1;
@@ -514,7 +514,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
        switch (collection->element_typecode) {
                case OCI_TYPECODE_DATE:
                        PHP_OCI_CALL_RETURN(errstatus, OCIDateToText, (connection->err, element, 0, 0, 0, 0, &buff_len, buff));
-       
+
                        if (errstatus != OCI_SUCCESS) {
                                connection->errcode = php_oci_error(connection->err, errstatus);
                                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -523,7 +523,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
 
                        ZVAL_STRINGL(result_element, (char *)buff, buff_len);
                        Z_STRVAL_P(result_element)[buff_len] = '\0';
-                       
+
                        return 0;
                        break;
 
@@ -531,9 +531,9 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
                {
                        OCIString *oci_string = *(OCIString **)element;
                        text *str;
-                       
+
                        PHP_OCI_CALL_RETURN(str, OCIStringPtr, (connection->env, oci_string));
-                       
+
                        if (str) {
                                ZVAL_STRING(result_element, (char *)str);
                        }
@@ -554,7 +554,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
                case OCI_TYPECODE_SMALLINT:                                                     /* SMALLINT */
                {
                        double double_number;
-                       
+
                        PHP_OCI_CALL_RETURN(errstatus, OCINumberToReal, (connection->err, (CONST OCINumber *) element, (uword) sizeof(double), (dvoid *) &double_number));
 
                        if (errstatus != OCI_SUCCESS) {
@@ -562,7 +562,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
                                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                                return 1;
                        }
-                       
+
                        ZVAL_DOUBLE(result_element, double_number);
 
                        return 0;
@@ -588,7 +588,7 @@ int php_oci_collection_element_set_null(php_oci_collection *collection, zend_lon
 
        /* set NULL element */
        PHP_OCI_CALL_RETURN(errstatus, OCICollAssignElem, (connection->env, connection->err, (ub4) index, (dvoid *)"", &null_index, collection->collection));
-       
+
        if (errstatus != OCI_SUCCESS) {
                connection->errcode = php_oci_error(connection->err, errstatus);
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -634,7 +634,7 @@ int php_oci_collection_element_set_date(php_oci_collection *collection, zend_lon
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                return 1;
        }
-                       
+
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        return 0;
 }
@@ -651,7 +651,7 @@ int php_oci_collection_element_set_number(php_oci_collection *collection, zend_l
        sword errstatus;
 
        element_double = zend_strtod(number, NULL);
-                       
+
        PHP_OCI_CALL_RETURN(errstatus, OCINumberFromReal, (connection->err, &element_double, sizeof(double), &oci_number));
 
        if (errstatus != OCI_SUCCESS) {
@@ -690,7 +690,7 @@ int php_oci_collection_element_set_string(php_oci_collection *collection, zend_l
        OCIString *ocistr = (OCIString *)0;
        php_oci_connection *connection = collection->connection;
        sword errstatus;
-                       
+
        PHP_OCI_CALL_RETURN(errstatus, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element, element_len, &ocistr));
 
        if (errstatus != OCI_SUCCESS) {
@@ -728,12 +728,12 @@ int php_oci_collection_element_set(php_oci_collection *collection, zend_long ind
        if (value_len == 0) {
                return php_oci_collection_element_set_null(collection, index);
        }
-       
+
        switch(collection->element_typecode) {
                case OCI_TYPECODE_DATE:
                        return php_oci_collection_element_set_date(collection, index, value, value_len);
                        break;
-                       
+
                case OCI_TYPECODE_VARCHAR2 :
                        return php_oci_collection_element_set_string(collection, index, value, value_len);
                        break;
@@ -768,7 +768,7 @@ int php_oci_collection_assign(php_oci_collection *collection_dest, php_oci_colle
 {
        php_oci_connection *connection = collection_dest->connection;
        sword errstatus;
-       
+
        PHP_OCI_CALL_RETURN(errstatus, OCICollAssign, (connection->env, connection->err, collection_from->collection, collection_dest->collection));
 
        if (errstatus != OCI_SUCCESS) {
@@ -798,7 +798,7 @@ void php_oci_collection_close(php_oci_collection *collection)
                        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
                }
        }
-       
+
        zend_list_delete(collection->connection->id);
        efree(collection);
        return;
index c42051442146b45c85bff62a226e516578dd02aa..cd17386b5fe325985f9077640e6da1a01e037f63 100644 (file)
@@ -172,7 +172,7 @@ PHP_FUNCTION(oci_bind_by_name)
        zval *z_statement;
        zval *bind_var = NULL;
        php_oci_statement *statement;
-       
+
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsz|ll", &z_statement, &name, &name_len, &bind_var, &maxlen, &type) == FAILURE) {
                return;
        }
@@ -180,7 +180,7 @@ PHP_FUNCTION(oci_bind_by_name)
        if (type) {
                bind_type = (ub2) type;
        }
-       
+
        PHP_OCI_ZVAL_TO_STATEMENT(z_statement, statement);
 
        if (php_oci_bind_by_name(statement, name, name_len, bind_var, maxlen, bind_type)) {
@@ -202,7 +202,7 @@ PHP_FUNCTION(oci_bind_array_by_name)
        zval *z_statement;
        zval *bind_var = NULL;
        php_oci_statement *statement;
-       
+
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "rszl|ll", &z_statement, &name, &name_len, &bind_var, &max_array_len, &max_item_len, &type) == FAILURE) {
                return;
        }
@@ -212,12 +212,12 @@ PHP_FUNCTION(oci_bind_array_by_name)
        if (ZEND_NUM_ARGS() == 5 && max_item_len <= 0) {
                max_item_len = -1;
        }
-       
+
        if (max_array_len <= 0) {
                php_error_docref(NULL, E_WARNING, "Maximum array length must be greater than zero");
                RETURN_FALSE;
        }
-       
+
        if (php_oci_bind_array_by_name(statement, name, (sb4) name_len, bind_var, max_array_len, max_item_len, type)) {
                RETURN_FALSE;
        }
@@ -237,7 +237,7 @@ PHP_FUNCTION(oci_free_descriptor)
                        return;
                }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
@@ -271,7 +271,7 @@ PHP_FUNCTION(oci_lob_save)
                        return;
                }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
@@ -283,7 +283,7 @@ PHP_FUNCTION(oci_lob_save)
                php_error_docref(NULL, E_WARNING, "Offset parameter must be greater than or equal to 0");
                RETURN_FALSE;
        }
-       
+
        if (php_oci_lob_write(descriptor, (ub4) offset, data, (ub4) data_len, &bytes_written)) {
                RETURN_FALSE;
        }
@@ -308,7 +308,7 @@ PHP_FUNCTION(oci_lob_import)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len) == FAILURE) {
                        return;
-               }       
+               }
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
@@ -337,14 +337,14 @@ PHP_FUNCTION(oci_lob_load)
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
        if (php_oci_lob_read(descriptor, -1, 0, &buffer, &buffer_len)) {
@@ -380,24 +380,24 @@ PHP_FUNCTION(oci_lob_read)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &z_descriptor, oci_lob_class_entry_ptr, &length) == FAILURE) {
                        return;
-               }       
+               }
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
        if (length <= 0) {
                php_error_docref(NULL, E_WARNING, "Length parameter must be greater than 0");
                RETURN_FALSE;
        }
-       
+
        if (php_oci_lob_read(descriptor, length, descriptor->lob_current_position, &buffer, &buffer_len)) {
                RETURN_FALSE;
-       }       
+       }
        if (buffer_len > 0) {
                zend_string *ret = zend_string_init(buffer, buffer_len, 0);
                efree(buffer);
@@ -416,20 +416,20 @@ PHP_FUNCTION(oci_lob_eof)
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
        ub4 lob_length;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (!php_oci_lob_get_length(descriptor, &lob_length)) {
                if (lob_length == descriptor->lob_current_position) {
                        RETURN_TRUE;
@@ -445,21 +445,21 @@ PHP_FUNCTION(oci_lob_tell)
 {
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
-       RETURN_LONG(descriptor->lob_current_position);  
+
+       RETURN_LONG(descriptor->lob_current_position);
 }
 /* }}} */
 
@@ -469,20 +469,20 @@ PHP_FUNCTION(oci_lob_rewind)
 {
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        descriptor->lob_current_position = 0;
 
        RETURN_TRUE;
@@ -497,7 +497,7 @@ PHP_FUNCTION(oci_lob_seek)
        php_oci_descriptor *descriptor;
        zend_long offset, whence = PHP_OCI_SEEK_SET;
        ub4 lob_length;
-       
+
        if (getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &offset, &whence) == FAILURE) {
                        return;
@@ -506,14 +506,14 @@ PHP_FUNCTION(oci_lob_seek)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol|l", &z_descriptor, oci_lob_class_entry_ptr, &offset, &whence) == FAILURE) {
                        return;
-               }       
+               }
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
        if (php_oci_lob_get_length(descriptor, &lob_length)) {
@@ -536,7 +536,7 @@ PHP_FUNCTION(oci_lob_seek)
                default:
                                descriptor->lob_current_position = (offset > 0) ? (ub4) offset : 0;
                        break;
-       }       
+       }
        if (descriptor->lob_current_position > UB4MAXVAL) {
                php_error_docref(NULL, E_WARNING, "Invalid offset or LOB position");
                RETURN_FALSE;
@@ -552,20 +552,20 @@ PHP_FUNCTION(oci_lob_size)
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
        ub4 lob_length;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (php_oci_lob_get_length(descriptor, &lob_length)) {
                RETURN_FALSE;
        }
@@ -583,12 +583,12 @@ PHP_FUNCTION(oci_lob_write)
        zend_long write_len = 0;
        ub4 bytes_written;
        char *data;
-       
+
        if (getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &data, &data_len, &write_len) == FAILURE) {
                        return;
                }
-               
+
                if (ZEND_NUM_ARGS() == 2) {
                        data_len = MIN((zend_long) data_len, write_len);
                }
@@ -602,18 +602,18 @@ PHP_FUNCTION(oci_lob_write)
                        data_len = MIN((zend_long) data_len, write_len);
                }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (data_len <= 0) {
                RETURN_LONG(0);
        }
-       
+
        if (php_oci_lob_write(descriptor, descriptor->lob_current_position, data, (ub4) data_len, &bytes_written)) {
                RETURN_FALSE;
        }
@@ -627,7 +627,7 @@ PHP_FUNCTION(oci_lob_append)
 {
        zval *tmp_dest, *tmp_from, *z_descriptor_dest = getThis(), *z_descriptor_from;
        php_oci_descriptor *descriptor_dest, *descriptor_from;
-       
+
        if (getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor_from, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
@@ -636,22 +636,22 @@ PHP_FUNCTION(oci_lob_append)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &z_descriptor_dest, oci_lob_class_entry_ptr, &z_descriptor_from, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp_dest = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_dest), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
                RETURN_FALSE;
        }
-       
+
        if ((tmp_from = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_from), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_dest, descriptor_dest);
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_from, descriptor_from);
-       
+
        if (php_oci_lob_append(descriptor_dest, descriptor_from)) {
                RETURN_FALSE;
        }
@@ -668,7 +668,7 @@ PHP_FUNCTION(oci_lob_truncate)
        php_oci_descriptor *descriptor;
        zend_long trim_length = 0;
        ub4 ub_trim_length;
-       
+
        if (getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &trim_length) == FAILURE) {
                        return;
@@ -677,9 +677,9 @@ PHP_FUNCTION(oci_lob_truncate)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l", &z_descriptor, oci_lob_class_entry_ptr, &trim_length) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
@@ -692,7 +692,7 @@ PHP_FUNCTION(oci_lob_truncate)
 
        ub_trim_length = (ub4) trim_length;
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (php_oci_lob_truncate(descriptor, ub_trim_length)) {
                RETURN_FALSE;
        }
@@ -708,7 +708,7 @@ PHP_FUNCTION(oci_lob_erase)
        php_oci_descriptor *descriptor;
        ub4 bytes_erased;
        zend_long offset = -1, length = -1;
-       
+
        if (getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &offset, &length) == FAILURE) {
                        return;
@@ -733,7 +733,7 @@ PHP_FUNCTION(oci_lob_erase)
                        php_error_docref(NULL, E_WARNING, "Offset must be greater than or equal to 0");
                        RETURN_FALSE;
                }
-               
+
                if (ZEND_NUM_ARGS() > 2 && length < 0) {
                        php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to 0");
                        RETURN_FALSE;
@@ -761,7 +761,7 @@ PHP_FUNCTION(oci_lob_flush)
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
        zend_long flush_flag = 0;
-       
+
        if (getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flush_flag) == FAILURE) {
                        return;
@@ -772,14 +772,14 @@ PHP_FUNCTION(oci_lob_flush)
                        return;
                }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (descriptor->buffering == PHP_OCI_LOB_BUFFER_DISABLED) {
                /* buffering wasn't enabled, there is nothing to flush */
                RETURN_FALSE;
@@ -799,7 +799,7 @@ PHP_FUNCTION(ocisetbufferinglob)
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
        zend_bool flag;
-       
+
        if (getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "b", &flag) == FAILURE) {
                        return;
@@ -808,16 +808,16 @@ PHP_FUNCTION(ocisetbufferinglob)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &z_descriptor, oci_lob_class_entry_ptr, &flag) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (php_oci_lob_set_buffering(descriptor, flag)) {
                RETURN_FALSE;
        }
@@ -831,20 +831,20 @@ PHP_FUNCTION(ocigetbufferinglob)
 {
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (descriptor->buffering != PHP_OCI_LOB_BUFFER_DISABLED) {
                RETURN_TRUE;
        }
@@ -859,29 +859,29 @@ PHP_FUNCTION(oci_lob_copy)
        zval *tmp_dest, *tmp_from, *z_descriptor_dest, *z_descriptor_from;
        php_oci_descriptor *descriptor_dest, *descriptor_from;
        zend_long length = 0;
-       
+
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO|l", &z_descriptor_dest, oci_lob_class_entry_ptr, &z_descriptor_from, oci_lob_class_entry_ptr, &length) == FAILURE) {
                return;
        }
-       
+
        if ((tmp_dest = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_dest), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
                RETURN_FALSE;
        }
-       
+
        if ((tmp_from = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_from), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_dest, descriptor_dest);
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_from, descriptor_from);
-       
+
        if (ZEND_NUM_ARGS() == 3 && length < 0) {
                php_error_docref(NULL, E_WARNING, "Length parameter must be greater than 0");
                RETURN_FALSE;
        }
-       
+
        if (ZEND_NUM_ARGS() == 2) {
                /* indicate that we want to copy from the current position to the end of the LOB */
                length = -1;
@@ -901,28 +901,28 @@ PHP_FUNCTION(oci_lob_is_equal)
        zval *tmp_first, *tmp_second, *z_descriptor_first, *z_descriptor_second;
        php_oci_descriptor *descriptor_first, *descriptor_second;
        boolean is_equal;
-               
+
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &z_descriptor_first, oci_lob_class_entry_ptr, &z_descriptor_second, oci_lob_class_entry_ptr) == FAILURE) {
                return;
        }
-       
+
        if ((tmp_first = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_first), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The first argument should be valid descriptor object");
                RETURN_FALSE;
        }
-       
+
        if ((tmp_second = zend_hash_str_find(Z_OBJPROP_P(z_descriptor_second), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property. The second argument should be valid descriptor object");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_first, descriptor_first);
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp_second, descriptor_second);
 
        if (php_oci_lob_is_equal(descriptor_first, descriptor_second, &is_equal)) {
                RETURN_FALSE;
        }
-       
+
        if (is_equal == TRUE) {
                RETURN_TRUE;
        }
@@ -933,7 +933,7 @@ PHP_FUNCTION(oci_lob_is_equal)
 /* {{{ proto bool oci_lob_export([string filename [, int start [, int length]]])
    Writes a large object into a file */
 PHP_FUNCTION(oci_lob_export)
-{      
+{
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
        char *filename;
@@ -947,7 +947,7 @@ PHP_FUNCTION(oci_lob_export)
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ll", &filename, &filename_len, &start, &length) == FAILURE) {
                        return;
                }
-       
+
                if (ZEND_NUM_ARGS() > 1 && start < 0) {
                        php_error_docref(NULL, E_WARNING, "Start parameter must be greater than or equal to 0");
                        RETURN_FALSE;
@@ -961,7 +961,7 @@ PHP_FUNCTION(oci_lob_export)
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op|ll", &z_descriptor, oci_lob_class_entry_ptr, &filename, &filename_len, &start, &length) == FAILURE) {
                        return;
                }
-                       
+
                if (ZEND_NUM_ARGS() > 2 && start < 0) {
                        php_error_docref(NULL, E_WARNING, "Start parameter must be greater than or equal to 0");
                        RETURN_FALSE;
@@ -976,13 +976,13 @@ PHP_FUNCTION(oci_lob_export)
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
-       
+
        if (php_oci_lob_get_length(descriptor, &lob_length)) {
                RETURN_FALSE;
-       }               
-       
+       }
+
        if (start == -1) {
                start = 0;
        }
@@ -1026,7 +1026,7 @@ PHP_FUNCTION(oci_lob_export)
                if (buffer) {
                        efree(buffer);
                }
-               
+
                length -= tmp_bytes_read;
                descriptor->lob_current_position += tmp_bytes_read;
                start += tmp_bytes_read;
@@ -1059,14 +1059,14 @@ PHP_FUNCTION(oci_lob_write_temporary)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|l", &z_descriptor, oci_lob_class_entry_ptr, &data, &data_len, &type) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
        if (php_oci_lob_write_tmp(descriptor, type, data, (int) data_len)) {
@@ -1082,18 +1082,18 @@ PHP_FUNCTION(oci_lob_close)
 {
        zval *tmp, *z_descriptor = getThis();
        php_oci_descriptor *descriptor;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_descriptor, oci_lob_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 
        if (php_oci_lob_close(descriptor)) {
@@ -1119,8 +1119,8 @@ PHP_FUNCTION(oci_new_descriptor)
        PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
        /* php_oci_lob_create() checks type */
-       descriptor = php_oci_lob_create(connection, type);      
-       
+       descriptor = php_oci_lob_create(connection, type);
+
        if (!descriptor) {
                RETURN_NULL();
        }
@@ -1170,7 +1170,7 @@ PHP_FUNCTION(oci_commit)
        if (connection->descriptors) {
                php_oci_connection_descriptors_free(connection);
        }
-       
+
        if (php_oci_connection_commit(connection)) {
                RETURN_FALSE;
        }
@@ -1245,7 +1245,7 @@ PHP_FUNCTION(oci_field_type)
        if (!column) {
                RETURN_FALSE;
        }
-       
+
        switch (column->data_type) {
 #ifdef SQLT_TIMESTAMP
                case SQLT_TIMESTAMP:
@@ -1460,7 +1460,7 @@ PHP_FUNCTION(oci_fetch_all)
 
                while (!php_oci_statement_fetch(statement, nrows)) {
                        zval row;
-                       
+
                        array_init_size(&row, statement->ncolumns);
 
                        for (i = 0; i < statement->ncolumns; i++) {
@@ -1491,11 +1491,11 @@ PHP_FUNCTION(oci_fetch_all)
                array_init_size(array, statement->ncolumns);
                columns = safe_emalloc(statement->ncolumns, sizeof(php_oci_out_column *), 0);
                outarrs = safe_emalloc(statement->ncolumns, sizeof(zval*), 0);
-               
+
                if (flags & PHP_OCI_NUM) {
                        for (i = 0; i < statement->ncolumns; i++) {
                                columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0);
-                               
+
                                array_init(&tmp);
                                outarrs[ i ] = zend_hash_next_index_insert(Z_ARRVAL_P(array), &tmp);
                        }
@@ -1503,7 +1503,7 @@ PHP_FUNCTION(oci_fetch_all)
                        for (i = 0; i < statement->ncolumns; i++) {
                                zend_string *zvtmp;
                                columns[ i ] = php_oci_statement_get_column(statement, i + 1, NULL, 0);
-                               
+
                                array_init(&tmp);
                                zvtmp = zend_string_init(columns[ i ]->name, columns[ i ]->name_len, 0);
                                outarrs[ i ] = zend_symtable_update(Z_ARRVAL_P(array), zvtmp, &tmp);
@@ -1524,7 +1524,7 @@ PHP_FUNCTION(oci_fetch_all)
                                break;
                        }
                }
-               
+
                efree(columns);
                efree(outarrs);
        }
@@ -1605,7 +1605,7 @@ PHP_FUNCTION(oci_close)
                /* do nothing to keep BC */
                return;
        }
-       
+
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_connection) == FAILURE) {
                return;
        }
@@ -1622,7 +1622,7 @@ PHP_FUNCTION(oci_close)
        }
 
        /* ZVAL_NULL(z_connection); */
-       
+
        RETURN_TRUE;
 }
 /* }}} */
@@ -2071,7 +2071,7 @@ PHP_FUNCTION(oci_new_cursor)
        PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
 
        statement = php_oci_statement_create(connection, NULL, 0);
-       
+
        if (statement) {
                RETURN_RES(statement->id);
        }
@@ -2084,7 +2084,7 @@ PHP_FUNCTION(oci_new_cursor)
 PHP_FUNCTION(oci_result)
 {
        php_oci_out_column *column;
-       
+
        column = php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
        if(column) {
                php_oci_column_to_zval(column, return_value, 0);
@@ -2124,7 +2124,7 @@ PHP_FUNCTION(oci_server_version)
        if (php_oci_server_get_version(connection, version, sizeof(version))) {
                RETURN_FALSE;
        }
-       
+
        ret = zend_string_init(version, strlen(version), 0);
        RETURN_STR(ret);
 }
@@ -2216,14 +2216,14 @@ PHP_FUNCTION(oci_free_collection)
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
        zend_list_close(collection->id);
@@ -2248,14 +2248,14 @@ PHP_FUNCTION(oci_collection_append)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &z_collection, oci_coll_class_entry_ptr, &value, &value_len) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
        if (php_oci_collection_append(collection, value, (int) value_len)) {
@@ -2282,20 +2282,20 @@ PHP_FUNCTION(oci_collection_element_get)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &z_collection, oci_coll_class_entry_ptr, &element_index) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
        if (php_oci_collection_element_get(collection, element_index, &value)) {
                RETURN_FALSE;
        }
-       
+
        RETURN_ZVAL(&value, 1, 1);
 }
 /* }}} */
@@ -2315,9 +2315,9 @@ PHP_FUNCTION(oci_collection_assign)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &z_collection_dest, oci_coll_class_entry_ptr, &z_collection_from, oci_coll_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp_dest = zend_hash_str_find(Z_OBJPROP_P(z_collection_dest), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property. The first argument should be valid collection object");
                RETURN_FALSE;
@@ -2356,14 +2356,14 @@ PHP_FUNCTION(oci_collection_element_assign)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ols", &z_collection, oci_coll_class_entry_ptr, &element_index, &value, &value_len) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
        if (php_oci_collection_element_set(collection, element_index, value, (int) value_len)) {
@@ -2380,18 +2380,18 @@ PHP_FUNCTION(oci_collection_size)
        zval *tmp, *z_collection = getThis();
        php_oci_collection *collection;
        sb4 size = 0;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
        if (php_oci_collection_size(collection, &size)) {
@@ -2408,18 +2408,18 @@ PHP_FUNCTION(oci_collection_max)
        zval *tmp, *z_collection = getThis();
        php_oci_collection *collection;
        zend_long max;
-       
+
        if (!getThis()) {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &z_collection, oci_coll_class_entry_ptr) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
        if (php_oci_collection_max(collection, &max)) {
@@ -2445,20 +2445,20 @@ PHP_FUNCTION(oci_collection_trim)
        else {
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &z_collection, oci_coll_class_entry_ptr, &trim_size) == FAILURE) {
                        return;
-               }       
+               }
        }
-       
+
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(z_collection), "collection", sizeof("collection")-1)) == NULL) {
                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                RETURN_FALSE;
        }
-       
+
        PHP_OCI_ZVAL_TO_COLLECTION(tmp, collection);
 
        if (php_oci_collection_trim(collection, trim_size)) {
                RETURN_FALSE;
        }
-       RETURN_TRUE;    
+       RETURN_TRUE;
 }
 /* }}} */
 
@@ -2471,13 +2471,13 @@ PHP_FUNCTION(oci_new_collection)
        php_oci_collection *collection;
        char *tdo, *schema = NULL;
        size_t tdo_len, schema_len = 0;
-       
+
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|s", &z_connection, &tdo, &tdo_len, &schema, &schema_len) == FAILURE) {
                return;
        }
-       
+
        PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
-       
+
        if ( (collection = php_oci_collection_create(connection, tdo, (int) tdo_len, schema, (int) schema_len)) ) {
                object_init_ex(return_value, oci_coll_class_entry_ptr);
                add_property_resource(return_value, "collection", collection->id);
index 3dce6d1cd3bc2a191deaeb289379c77f5951e709..f80aeae7879b1e02571acaf639e19137fcd928d9 100644 (file)
@@ -81,7 +81,7 @@ php_oci_descriptor *php_oci_lob_create (php_oci_connection *connection, zend_lon
        }
 
        PHP_OCI_REGISTER_RESOURCE(descriptor, le_descriptor);
-       
+
        descriptor->lob_current_position = 0;
        descriptor->lob_size = -1;                              /* we should set it to -1 to know, that it's just not initialized */
        descriptor->buffering = PHP_OCI_LOB_BUFFER_DISABLED;                            /* buffering is off by default */
@@ -97,7 +97,7 @@ php_oci_descriptor *php_oci_lob_create (php_oci_connection *connection, zend_lon
                        zend_hash_init(connection->descriptors, 0, NULL, php_oci_descriptor_flush_hash_dtor, 0);
                        connection->descriptor_count = 0;
                }
-               
+
                descriptor->index = (connection->descriptor_count)++;
                if (connection->descriptor_count == LONG_MAX) {
                        php_error_docref(NULL, E_WARNING, "Internal descriptor counter has reached limit");
@@ -120,7 +120,7 @@ int php_oci_lob_get_length (php_oci_descriptor *descriptor, ub4 *length)
        sword errstatus;
 
        *length = 0;
-       
+
        if (descriptor->lob_size >= 0) {
                *length = descriptor->lob_size;
                return 0;
@@ -133,7 +133,7 @@ int php_oci_lob_get_length (php_oci_descriptor *descriptor, ub4 *length)
                                return 1;
                        }
                }
-               
+
                PHP_OCI_CALL_RETURN(errstatus, OCILobGetLength, (connection->svc, connection->err, descriptor->descriptor, (ub4 *)length));
 
                if (errstatus != OCI_SUCCESS) {
@@ -156,7 +156,7 @@ int php_oci_lob_get_length (php_oci_descriptor *descriptor, ub4 *length)
 
                connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        }
-       return 0;       
+       return 0;
 }
 /* }}} */
 
@@ -226,7 +226,7 @@ static inline int php_oci_lob_calculate_buffer(php_oci_descriptor *descriptor, z
                descriptor->chunk_size = chunk_size;
                connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        }
-       
+
        if ((read_length % descriptor->chunk_size) != 0) {
                return (int) descriptor->chunk_size * (((int) read_length / descriptor->chunk_size) + 1);
        }
@@ -264,24 +264,24 @@ int php_oci_lob_read (php_oci_descriptor *descriptor, zend_long read_length, zen
        if (length <= 0) {
                return 0;
        }
-       
+
        if (initial_offset > length) {
                php_error_docref(NULL, E_WARNING, "Offset must be less than size of the LOB");
                return 1;
        }
-               
+
        if (read_length == -1) {
                requested_len = length;
        }
-       
+
        if ((ub4) requested_len > (length - (ub4) initial_offset)) {
                requested_len = length - initial_offset;
        }
-       
+
        if (requested_len <= 0) {
                return 0;
        }
-       
+
        offset = initial_offset;
 
        if (descriptor->type == OCI_DTYPE_FILE) {
@@ -352,15 +352,15 @@ int php_oci_lob_read (php_oci_descriptor *descriptor, zend_long read_length, zen
                        (ub1) descriptor->charset_form                                    /* The character set form of the buffer data. */
                )
        );
-       
+
        efree(bufp);
-       
+
        if (is_clob) {
                offset = descriptor->lob_current_position + chars_read;
        } else {
                offset = descriptor->lob_current_position + bytes_read;
        }
-       
+
        if (errstatus != OCI_SUCCESS) {
                connection->errcode = php_oci_error(connection->err, errstatus);
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -371,7 +371,7 @@ int php_oci_lob_read (php_oci_descriptor *descriptor, zend_long read_length, zen
                *data_len = 0;
                return 1;
        }
-       
+
        descriptor->lob_current_position = (int)offset;
 
        if (descriptor->type == OCI_DTYPE_FILE) {
@@ -402,20 +402,20 @@ int php_oci_lob_write (php_oci_descriptor *descriptor, ub4 offset, char *data, i
        php_oci_connection *connection = (php_oci_connection *) descriptor->connection;
        ub4 lob_length;
        sword errstatus;
-       
+
        *bytes_written = 0;
        if (php_oci_lob_get_length(descriptor, &lob_length)) {
                return 1;
        }
-       
+
        if (!data || data_len <= 0) {
                return 0;
        }
-       
+
        if (offset > descriptor->lob_current_position) {
                offset = descriptor->lob_current_position;
        }
-       
+
        PHP_OCI_CALL_RETURN(errstatus, OCILobWrite,
                        (
                                connection->svc,
@@ -441,16 +441,16 @@ int php_oci_lob_write (php_oci_descriptor *descriptor, ub4 offset, char *data, i
        }
        *bytes_written = data_len;
        descriptor->lob_current_position += data_len;
-       
+
        if ((int) descriptor->lob_current_position > (int) descriptor->lob_size) {
                descriptor->lob_size = descriptor->lob_current_position;
        }
-       
+
        /* marking buffer as used */
        if (descriptor->buffering == PHP_OCI_LOB_BUFFER_ENABLED) {
                descriptor->buffering = PHP_OCI_LOB_BUFFER_USED;
        }
-       
+
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        return 0;
 }
@@ -467,12 +467,12 @@ int php_oci_lob_set_buffering (php_oci_descriptor *descriptor, int on_off)
                /* disabling when it's already off */
                return 0;
        }
-       
+
        if (on_off && descriptor->buffering != PHP_OCI_LOB_BUFFER_DISABLED) {
                /* enabling when it's already on */
                return 0;
        }
-       
+
        if (on_off) {
                PHP_OCI_CALL_RETURN(errstatus, OCILobEnableBuffering, (connection->svc, connection->err, descriptor->descriptor));
        } else {
@@ -509,11 +509,11 @@ int php_oci_lob_copy (php_oci_descriptor *descriptor_dest, php_oci_descriptor *d
        php_oci_connection *connection = descriptor_dest->connection;
        ub4 length_dest, length_from, copy_len;
        sword errstatus;
-       
+
        if (php_oci_lob_get_length(descriptor_dest, &length_dest)) {
                return 1;
        }
-       
+
        if (php_oci_lob_get_length(descriptor_from, &length_from)) {
                return 1;
        }
@@ -546,7 +546,7 @@ int php_oci_lob_copy (php_oci_descriptor *descriptor_dest, php_oci_descriptor *d
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                return 1;
        }
-       
+
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        return 0;
 }
@@ -573,7 +573,7 @@ int php_oci_lob_close (php_oci_descriptor *descriptor)
        if (php_oci_temp_lob_close(descriptor)) {
                return 1;
        }
-       
+
        return 0;
 }
 /* }}} */
@@ -587,16 +587,16 @@ int php_oci_temp_lob_close (php_oci_descriptor *descriptor)
        sword errstatus;
 
        PHP_OCI_CALL_RETURN(errstatus, OCILobIsTemporary, (connection->env,connection->err, descriptor->descriptor, &is_temporary));
-       
+
        if (errstatus != OCI_SUCCESS) {
                connection->errcode = php_oci_error(connection->err, errstatus);
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                return 1;
        }
-       
+
        if (is_temporary) {
                PHP_OCI_CALL_RETURN(errstatus, OCILobFreeTemporary, (connection->svc, connection->err, descriptor->descriptor));
-               
+
                if (errstatus != OCI_SUCCESS) {
                        connection->errcode = php_oci_error(connection->err, errstatus);
                        PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -630,7 +630,7 @@ int php_oci_lob_flush(php_oci_descriptor *descriptor, zend_long flush_flag)
                        return 1;
                        break;
        }
-       
+
        /* do not really flush buffer, but report success
         * to suppress OCI error when flushing not used buffer
         * */
@@ -683,7 +683,7 @@ void php_oci_lob_free (php_oci_descriptor *descriptor)
                        }
                }
        }
-       
+
        /* flushing Lobs & Files with buffering enabled */
        if ((descriptor->type == OCI_DTYPE_FILE || descriptor->type == OCI_DTYPE_LOB) && descriptor->buffering == PHP_OCI_LOB_BUFFER_USED) {
                php_oci_lob_flush(descriptor, OCI_LOB_BUFFER_FREE);
@@ -711,17 +711,17 @@ int php_oci_lob_import (php_oci_descriptor *descriptor, char *filename)
        char buf[8192];
        ub4 offset = 1;
        sword errstatus;
-       
+
        if (php_check_open_basedir(filename)) {
                return 1;
        }
-       
+
        if ((fp = VCWD_OPEN(filename, O_RDONLY|O_BINARY)) == -1) {
                php_error_docref(NULL, E_WARNING, "Can't open file %s", filename);
                return 1;
        }
 
-       while ((loblen = read(fp, &buf, sizeof(buf))) > 0) {    
+       while ((loblen = read(fp, &buf, sizeof(buf))) > 0) {
                PHP_OCI_CALL_RETURN(errstatus,
                                OCILobWrite,
                                (
@@ -751,7 +751,7 @@ int php_oci_lob_import (php_oci_descriptor *descriptor, char *filename)
                offset += loblen;
        }
        close(fp);
-       
+
        return 0;
 }
        /* }}} */
@@ -769,7 +769,7 @@ int php_oci_lob_append (php_oci_descriptor *descriptor_dest, php_oci_descriptor
        if (php_oci_lob_get_length(descriptor_dest, &dest_len)) {
                return 1;
        }
-       
+
        if (php_oci_lob_get_length(descriptor_from, &from_len)) {
                return 1;
        }
@@ -798,11 +798,11 @@ int php_oci_lob_truncate (php_oci_descriptor *descriptor, zend_long new_lob_leng
        OCILobLocator *lob = descriptor->descriptor;
        ub4 lob_length;
        sword errstatus;
-       
+
        if (php_oci_lob_get_length(descriptor, &lob_length)) {
                return 1;
        }
-       
+
        if (lob_length <= 0) {
                return 0;
        }
@@ -816,7 +816,7 @@ int php_oci_lob_truncate (php_oci_descriptor *descriptor, zend_long new_lob_leng
                php_error_docref(NULL, E_WARNING, "Size must be less than or equal to the current LOB size");
                return 1;
        }
-       
+
        PHP_OCI_CALL_RETURN(errstatus, OCILobTrim, (connection->svc, connection->err, lob, (ub4) new_lob_length));
 
        if (errstatus != OCI_SUCCESS) {
@@ -824,7 +824,7 @@ int php_oci_lob_truncate (php_oci_descriptor *descriptor, zend_long new_lob_leng
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                return 1;
        }
-       
+
        descriptor->lob_size = (ub4) new_lob_length;
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
 
@@ -842,11 +842,11 @@ int php_oci_lob_erase (php_oci_descriptor *descriptor, zend_long offset, ub4 len
        sword errstatus;
 
        *bytes_erased = 0;
-       
+
        if (php_oci_lob_get_length(descriptor, &lob_length)) {
                return 1;
        }
-       
+
        if (offset == -1) {
                offset = descriptor->lob_current_position;
        }
@@ -854,7 +854,7 @@ int php_oci_lob_erase (php_oci_descriptor *descriptor, zend_long offset, ub4 len
        if (length == -1) {
                length = lob_length;
        }
-       
+
        PHP_OCI_CALL_RETURN(errstatus, OCILobErase, (connection->svc, connection->err, lob, (ub4 *)&length, (ub4) offset+1));
 
        if (errstatus != OCI_SUCCESS) {
@@ -862,7 +862,7 @@ int php_oci_lob_erase (php_oci_descriptor *descriptor, zend_long offset, ub4 len
                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                return 1;
        }
-       
+
        *bytes_erased = length;
        connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        return 0;
@@ -898,7 +898,7 @@ int php_oci_lob_write_tmp (php_oci_descriptor *descriptor, zend_long type, char
        OCILobLocator *lob                 = descriptor->descriptor;
        ub4 bytes_written = 0;
        sword errstatus;
-       
+
        switch (type) {
                case OCI_TEMP_BLOB:
                case OCI_TEMP_CLOB:
index 97aa51b077ecebc85942ffd4e79859f7eac0033a..a0635fb7e677fc26705dd653263e9e5ac646e70b 100644 (file)
@@ -60,9 +60,9 @@ php_oci_statement *php_oci_statement_create(php_oci_connection *connection, char
                /* do not allocate stmt handle for refcursors, we'll get it from OCIStmtPrepare2() */
                PHP_OCI_CALL(OCIHandleAlloc, (connection->env, (dvoid **)&(statement->stmt), OCI_HTYPE_STMT, 0, NULL));
        }
-               
+
        PHP_OCI_CALL(OCIHandleAlloc, (connection->env, (dvoid **)&(statement->err), OCI_HTYPE_ERROR, 0, NULL));
-       
+
        if (query_len > 0) {
                PHP_OCI_CALL_RETURN(errstatus, OCIStmtPrepare2,
                                (
@@ -93,7 +93,7 @@ php_oci_statement *php_oci_statement_create(php_oci_connection *connection, char
                        return NULL;
                }
        }
-       
+
        if (query && query_len) {
                statement->last_query = ecalloc(1, query_len + 1);
                memcpy(statement->last_query, query, query_len);
@@ -118,11 +118,11 @@ php_oci_statement *php_oci_statement_create(php_oci_connection *connection, char
        } else {
                php_oci_statement_set_prefetch(statement, (ub4)100); /* semi-arbitrary, "sensible default" */
        }
-       
+
        PHP_OCI_REGISTER_RESOURCE(statement, le_statement);
 
        OCI_G(num_statements)++;
-       
+
        return statement;
 }
 /* }}} */
@@ -153,7 +153,7 @@ php_oci_statement *php_oci_get_implicit_resultset(php_oci_statement *statement)
                statement2 = ecalloc(1,sizeof(php_oci_statement));
 
                PHP_OCI_CALL(OCIHandleAlloc, (statement->connection->env, (dvoid **)&(statement2->err), OCI_HTYPE_ERROR, 0, NULL));
-               statement2->stmt = (OCIStmt *)result;   
+               statement2->stmt = (OCIStmt *)result;
                statement2->parent_stmtid = statement->id;
                statement2->impres_child_stmt = NULL;
                statement2->impres_count = 0;
@@ -175,11 +175,11 @@ php_oci_statement *php_oci_get_implicit_resultset(php_oci_statement *statement)
                GC_REFCOUNT(statement2->connection->id)++;
 
                php_oci_statement_set_prefetch(statement2, statement->prefetch_count);
-               
+
                PHP_OCI_REGISTER_RESOURCE(statement2, le_statement);
-       
+
                OCI_G(num_statements)++;
-               
+
                return statement2;
        }
 #endif /* OCI_MAJOR_VERSION < 12 */
@@ -197,7 +197,7 @@ int php_oci_statement_set_prefetch(php_oci_statement *statement, ub4 prefetch )
        }
 
        PHP_OCI_CALL_RETURN(errstatus, OCIAttrSet, (statement->stmt, OCI_HTYPE_STMT, &prefetch, 0, OCI_ATTR_PREFETCH_ROWS, statement->err));
-       
+
        if (errstatus != OCI_SUCCESS) {
                statement->errcode = php_oci_error(statement->err, errstatus);
                PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
@@ -293,7 +293,7 @@ int php_oci_statement_fetch(php_oci_statement *statement, ub4 nrows)
                        piecewisecols = 1;
                }
        }
-       
+
        while (errstatus == OCI_NEED_DATA) {
                if (piecewisecols) {
                        PHP_OCI_CALL_RETURN(errstatus,
@@ -359,11 +359,11 @@ int php_oci_statement_fetch(php_oci_statement *statement, ub4 nrows)
                        if (column == NULL) {
                                continue;
                        }
-                       
+
                        if (!column->define) {
                                continue;
                        }
-                       
+
                        ZEND_ASSERT(Z_ISREF(column->define->val));
                        zval_ptr_dtor(Z_REFVAL(column->define->val));
                        ZVAL_NULL(Z_REFVAL(column->define->val));
@@ -419,11 +419,11 @@ sb4 php_oci_define_callback(dvoid *ctx, OCIDefine *define, ub4 iter, dvoid **buf
        php_oci_out_column *outcol = (php_oci_out_column *)ctx;
 
        if (!outcol) {
-               
+
                php_error_docref(NULL, E_WARNING, "Invalid context pointer value");
                return OCI_ERROR;
        }
-       
+
        switch(outcol->data_type) {
                case SQLT_RSET: {
                                php_oci_statement *nested_stmt;
@@ -466,7 +466,7 @@ sb4 php_oci_define_callback(dvoid *ctx, OCIDefine *define, ub4 iter, dvoid **buf
                                }
                                outcol->descid = descr->id;
                                descr->charset_form = outcol->charset_form;
-                               
+
                                *bufpp = descr->descriptor;
                                *alenpp = &(outcol->retlen4);
                                *piecep = OCI_ONE_PIECE;
@@ -512,7 +512,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
                        return 1;
                        break;
        }
-       
+
        if (!statement->stmttype) {
                /* get statement type */
                PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)statement->stmt, OCI_HTYPE_STMT, (ub2 *)&statement->stmttype, (ub4 *)0, OCI_ATTR_STMT_TYPE, statement->err));
@@ -531,7 +531,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
        } else {
                iters = 1;
        }
-       
+
        if (statement->last_query) { /* Don't execute REFCURSORS or Implicit Result Set handles */
 
                if (statement->binds) {
@@ -550,7 +550,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
                        PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
                        return 1;
                }
-               
+
                if (statement->binds) {
                        zend_hash_apply(statement->binds, php_oci_bind_post_exec);
                }
@@ -575,15 +575,15 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
        if (statement->stmttype == OCI_STMT_SELECT && statement->executed == 0) {
                /* we only need to do the define step is this very statement is executed the first time! */
                statement->executed = 1;
-               
+
                ALLOC_HASHTABLE(statement->columns);
                zend_hash_init(statement->columns, 13, NULL, php_oci_column_hash_dtor, 0);
-               
+
                counter = 1;
 
                /* get number of columns */
                PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)statement->stmt, OCI_HTYPE_STMT, (dvoid *)&colcount, (ub4 *)0, OCI_ATTR_PARAM_COUNT, statement->err));
-               
+
                if (errstatus != OCI_SUCCESS) {
                        statement->errcode = php_oci_error(statement->err, errstatus);
                        PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
@@ -591,19 +591,19 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
                }
 
                statement->ncolumns = colcount;
-               
+
                for (counter = 1; counter <= colcount; counter++) {
                        outcol = (php_oci_out_column *) ecalloc(1, sizeof(php_oci_out_column));
-                       
+
                        if ((outcol = zend_hash_index_update_ptr(statement->columns, counter, outcol)) == NULL) {
                                FREE_HASHTABLE(statement->columns);
                                /* out of memory */
                                return 1;
                        }
-                       
+
                        /* get column */
                        PHP_OCI_CALL_RETURN(errstatus, OCIParamGet, ((dvoid *)statement->stmt, OCI_HTYPE_STMT, statement->err, (dvoid**)&param, counter));
-                       
+
                        if (errstatus != OCI_SUCCESS) {
                                statement->errcode = php_oci_error(statement->err, errstatus);
                                PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
@@ -629,7 +629,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
                                PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
                                return 1;
                        }
-       
+
                        /* get character set id  */
                        PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)param, OCI_DTYPE_PARAM, (dvoid *)&outcol->charset_id, (ub4 *)0, OCI_ATTR_CHARSET_ID, statement->err));
 
@@ -639,10 +639,10 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
                                PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
                                return 1;
                        }
-       
+
                        /* get size of the column */
                        PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)param, OCI_DTYPE_PARAM, (dvoid *)&outcol->data_size, (dvoid *)0, OCI_ATTR_DATA_SIZE, statement->err));
-                       
+
                        if (errstatus != OCI_SUCCESS) {
                                PHP_OCI_CALL(OCIDescriptorFree, (param, OCI_DTYPE_PARAM));
                                statement->errcode = php_oci_error(statement->err, errstatus);
@@ -655,7 +655,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
 
                        /* get scale of the column */
                        PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)param, OCI_DTYPE_PARAM, (dvoid *)&outcol->scale, (dvoid *)0, OCI_ATTR_SCALE, statement->err));
-                       
+
                        if (errstatus != OCI_SUCCESS) {
                                PHP_OCI_CALL(OCIDescriptorFree, (param, OCI_DTYPE_PARAM));
                                statement->errcode = php_oci_error(statement->err, errstatus);
@@ -665,17 +665,17 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
 
                        /* get precision of the column */
                        PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)param, OCI_DTYPE_PARAM, (dvoid *)&outcol->precision, (dvoid *)0, OCI_ATTR_PRECISION, statement->err));
-                       
+
                        if (errstatus != OCI_SUCCESS) {
                                PHP_OCI_CALL(OCIDescriptorFree, (param, OCI_DTYPE_PARAM));
                                statement->errcode = php_oci_error(statement->err, errstatus);
                                PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
                                return 1;
                        }
-                       
+
                        /* get name of the column */
                        PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)param, OCI_DTYPE_PARAM, (dvoid **)&colname, (ub4 *)&outcol->name_len, (ub4)OCI_ATTR_NAME, statement->err));
-                       
+
                        if (errstatus != OCI_SUCCESS) {
                                PHP_OCI_CALL(OCIDescriptorFree, (param, OCI_DTYPE_PARAM));
                                statement->errcode = php_oci_error(statement->err, errstatus);
@@ -766,9 +766,9 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
                                        } else {
                                                outcol->storage_size4++; /* add one for string terminator */
                                        }
-                                       
+
                                        outcol->storage_size4 *= 3;
-                                       
+
                                        dynamic = OCI_DEFAULT;
                                        buf = outcol->data = (text *) safe_emalloc(1, outcol->storage_size4, 0);
                                        memset(buf, 0, outcol->storage_size4);
@@ -812,7 +812,7 @@ int php_oci_statement_execute(php_oci_statement *statement, ub4 mode)
                                );
 
                        }
-                       
+
                        if (errstatus != OCI_SUCCESS) {
                                statement->errcode = php_oci_error(statement->err, errstatus);
                                PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
@@ -902,7 +902,7 @@ void php_oci_statement_free(php_oci_statement *statement)
 
        zend_list_delete(statement->connection->id);
        efree(statement);
-       
+
        OCI_G(num_statements)--;
 }
 /* }}} */
@@ -923,7 +923,7 @@ int php_oci_bind_pre_exec(zval *data, void *result)
                 * bind->indicator are not used for oci_bind_array_by_name.
                 */
                return 0;
-       }       
+       }
        switch (bind->type) {
                case SQLT_NTY:
                case SQLT_BFILEE:
@@ -936,7 +936,7 @@ int php_oci_bind_pre_exec(zval *data, void *result)
                                *(int *)result = 1;
                        }
                        break;
-                       
+
                case SQLT_CHR:
                case SQLT_AFC:
                case SQLT_INT:
@@ -1036,7 +1036,7 @@ int php_oci_bind_post_exec(zval *data)
                                        ub4 buff_len = 1024;
 
                                        memset((void*)buff,0,sizeof(buff));
-                                                       
+
                                        if ((i < (int) bind->array.old_length) && (entry = zend_hash_get_current_data(hash)) != NULL) {
                                                PHP_OCI_CALL_RETURN(errstatus, OCIDateToText, (connection->err, &(((OCIDate *)(bind->array.elements))[i]), 0, 0, 0, 0, &buff_len, buff));
                                                zval_ptr_dtor(entry);
@@ -1063,7 +1063,7 @@ int php_oci_bind_post_exec(zval *data)
                                        }
                                }
                                break;
-       
+
                        case SQLT_AFC:
                        case SQLT_CHR:
                        case SQLT_VCS:
@@ -1119,7 +1119,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
                case SQLT_NTY:
                {
                        zval *tmp;
-                       
+
                        if (Z_TYPE_P(param) != IS_OBJECT || (tmp = zend_hash_str_find(Z_OBJPROP_P(param), "collection", sizeof("collection")-1)) == NULL) {
                                php_error_docref(NULL, E_WARNING, "Unable to find collection property");
                                return 1;
@@ -1128,7 +1128,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
                        PHP_OCI_ZVAL_TO_COLLECTION_EX(tmp, bind_collection);
                        value_sz = sizeof(void*);
                        mode = OCI_DEFAULT;
-               
+
                        if (!bind_collection->collection) {
                                return 1;
                        }
@@ -1141,7 +1141,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
                case SQLT_RDD:
                {
                        zval *tmp;
-                       
+
                        if (Z_TYPE_P(param) != IS_OBJECT || (tmp = zend_hash_str_find(Z_OBJPROP_P(param), "descriptor", sizeof("descriptor")-1)) == NULL) {
                                php_error_docref(NULL, E_WARNING, "Unable to find descriptor property");
                                return 1;
@@ -1150,15 +1150,15 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
                        PHP_OCI_ZVAL_TO_DESCRIPTOR_EX(tmp, bind_descriptor);
 
                        value_sz = sizeof(void*);
-                       
+
                        oci_desc = bind_descriptor->descriptor;
-                       
+
                        if (!oci_desc) {
                                return 1;
                        }
                }
                        break;
-                       
+
                case SQLT_INT:
                case SQLT_NUM:
                        if (Z_TYPE_P(param) == IS_RESOURCE || Z_TYPE_P(param) == IS_OBJECT) {
@@ -1170,7 +1170,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
                        value_sz = sizeof(oci_phpsized_int);
                        mode = OCI_DEFAULT;
                        break;
-                       
+
                case SQLT_LBI:
                case SQLT_BIN:
                case SQLT_LNG:
@@ -1265,7 +1265,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
         */
        if (value_sz == 0)
                value_sz = 1;
-       
+
        bindp->descriptor = oci_desc;
        bindp->statement = oci_stmt;
        bindp->parent_statement = statement;
@@ -1283,7 +1283,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
                        statement->stmt,                                 /* statement handle */
                        (OCIBind **)&bindp->bind,                /* bind hdl (will alloc) */
                        statement->err,                                  /* error handle */
-                       (text*) name,                                    /* placeholder name */                                 
+                       (text*) name,                                    /* placeholder name */
                        (sb4) name_len,                                  /* placeholder length */
                        (dvoid *)bind_data,                              /* in/out data */
                        value_sz, /* PHP_OCI_MAX_DATA_SIZE, */ /* max size of input/output data */
@@ -1335,14 +1335,14 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, size_t name_l
                                 (ub4 *) 0
                                )
                );
-               
+
                if (errstatus) {
                        statement->errcode = php_oci_error(statement->err, errstatus);
                        PHP_OCI_HANDLE_ERROR(statement->connection, statement->errcode);
                        return 1;
                }
        }
-       
+
        statement->errcode = 0; /* retain backwards compat with OCI8 1.4 */
        return 0;
 }
@@ -1484,7 +1484,7 @@ sb4 php_oci_bind_out_callback(
                Z_STRVAL_P(val) = ecalloc(1, Z_STRLEN_P(val) + 1);
                /* XXX is this right? */
                ZVAL_STRINGL(val, NULL, Z_STRLEN(val) + 1);
-#endif         
+#endif
 
                /* XXX we assume that zend-zval len has 4 bytes */
                *alenpp = (ub4*) &Z_STRLEN_P(val);
@@ -1520,7 +1520,7 @@ php_oci_out_column *php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAME
        if (need_data && !statement->has_data) {
                return NULL;
        }
-       
+
        if (Z_TYPE_P(column_index) == IS_STRING) {
                column = php_oci_statement_get_column(statement, -1, Z_STRVAL_P(column_index), (int) Z_STRLEN_P(column_index));
                if (!column) {
@@ -1551,9 +1551,9 @@ int php_oci_statement_get_type(php_oci_statement *statement, ub2 *type)
 {
        ub2 statement_type;
        sword errstatus;
-       
+
        *type = 0;
-       
+
        PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)statement->stmt, OCI_HTYPE_STMT, (ub2 *)&statement_type, (ub4 *)0, OCI_ATTR_STMT_TYPE, statement->err));
 
        if (errstatus != OCI_SUCCESS) {
@@ -1574,9 +1574,9 @@ int php_oci_statement_get_numrows(php_oci_statement *statement, ub4 *numrows)
 {
        ub4 statement_numrows;
        sword errstatus;
-       
+
        *numrows = 0;
-       
+
        PHP_OCI_CALL_RETURN(errstatus, OCIAttrGet, ((dvoid *)statement->stmt, OCI_HTYPE_STMT, (ub4 *)&statement_numrows, (ub4 *)0, OCI_ATTR_ROW_COUNT, statement->err));
 
        if (errstatus != OCI_SUCCESS) {
@@ -1609,7 +1609,7 @@ int php_oci_bind_array_by_name(php_oci_statement *statement, char *name, size_t
                php_error_docref(NULL, E_WARNING, "Invalid max length value (" ZEND_LONG_FMT ")", maxlength);
                return 1;
        }
-       
+
        switch(type) {
                case SQLT_NUM:
                case SQLT_INT:
@@ -1620,7 +1620,7 @@ int php_oci_bind_array_by_name(php_oci_statement *statement, char *name, size_t
                case SQLT_FLT:
                        bind = php_oci_bind_array_helper_double(val, max_table_length);
                        break;
-                       
+
                case SQLT_AFC:
                case SQLT_CHR:
                case SQLT_VCS:
@@ -1646,7 +1646,7 @@ int php_oci_bind_array_by_name(php_oci_statement *statement, char *name, size_t
                /* failed to generate bind struct */
                return 1;
        }
-       
+
        bind->descriptor = NULL;
        bind->statement = NULL;
        bind->parent_statement = statement;
@@ -1675,8 +1675,8 @@ int php_oci_bind_array_by_name(php_oci_statement *statement, char *name, size_t
                                                                (ub4) OCI_DEFAULT
                                                        )
                                                );
-       
-               
+
+
        if (errstatus != OCI_SUCCESS) {
                if (bind->array.elements) {
                        efree(bind->array.elements);
@@ -1737,7 +1737,7 @@ php_oci_bind *php_oci_bind_array_helper_string(zval *var, zend_long max_table_le
                        zend_hash_move_forward(hash);
                }
        }
-       
+
        bind = emalloc(sizeof(php_oci_bind));
        ZVAL_UNDEF(&bind->val);
        bind->array.elements            = (text *)safe_emalloc(max_table_length * (maxlength + 1), sizeof(text), 0);
@@ -1749,9 +1749,9 @@ php_oci_bind *php_oci_bind_array_helper_string(zval *var, zend_long max_table_le
        memset(bind->array.element_lengths, 0, max_table_length*sizeof(ub2));
        bind->array.indicators          = safe_emalloc(max_table_length, sizeof(sb2), 0);
        memset(bind->array.indicators, 0, max_table_length*sizeof(sb2));
-       
+
        zend_hash_internal_pointer_reset(hash);
-       
+
        for (i = 0; i < bind->array.current_length; i++) {
                if ((entry = zend_hash_get_current_data(hash)) != NULL) {
                        convert_to_string_ex(entry);
@@ -1769,13 +1769,13 @@ php_oci_bind *php_oci_bind_array_helper_string(zval *var, zend_long max_table_le
        for (i = 0; i < max_table_length; i++) {
                if ((i < bind->array.current_length) && (entry = zend_hash_get_current_data(hash)) != NULL) {
                        int element_length;
-                       
+
                        convert_to_string_ex(entry);
                        element_length = ((size_t) maxlength > Z_STRLEN_P(entry)) ? (int) Z_STRLEN_P(entry) : (int) maxlength;
-                       
+
                        memcpy((text *)bind->array.elements + i*maxlength, Z_STRVAL_P(entry), element_length);
                        ((text *)bind->array.elements)[i*maxlength + element_length] = '\0';
-                       
+
                        zend_hash_move_forward(hash);
                } else {
                        ((text *)bind->array.elements)[i*maxlength] = '\0';
@@ -1808,7 +1808,7 @@ php_oci_bind *php_oci_bind_array_helper_number(zval *var, zend_long max_table_le
        bind->array.element_lengths     = safe_emalloc(max_table_length, sizeof(ub2), 0);
        memset(bind->array.element_lengths, 0, max_table_length * sizeof(ub2));
        bind->array.indicators          = NULL;
-       
+
        zend_hash_internal_pointer_reset(hash);
        for (i = 0; i < max_table_length; i++) {
                if (i < bind->array.current_length) {
@@ -1849,7 +1849,7 @@ php_oci_bind *php_oci_bind_array_helper_double(zval *var, zend_long max_table_le
        bind->array.element_lengths     = safe_emalloc(max_table_length, sizeof(ub2), 0);
        memset(bind->array.element_lengths, 0, max_table_length * sizeof(ub2));
        bind->array.indicators          = NULL;
-       
+
        zend_hash_internal_pointer_reset(hash);
        for (i = 0; i < max_table_length; i++) {
                if (i < bind->array.current_length) {
@@ -1899,7 +1899,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval *var, zend_long max_table_leng
                        bind->array.element_lengths[i] = sizeof(OCIDate);
                }
                if ((i < bind->array.current_length) && (entry = zend_hash_get_current_data(hash)) != NULL) {
-                       
+
                        convert_to_string_ex(entry);
                        PHP_OCI_CALL_RETURN(errstatus, OCIDateFromText, (connection->err, (CONST text *)Z_STRVAL_P(entry), (ub4) Z_STRLEN_P(entry), NULL, 0, NULL, 0, &oci_date));
 
@@ -1912,7 +1912,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval *var, zend_long max_table_leng
                                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                                return NULL;
                        }
-                       
+
                        ((OCIDate *)bind->array.elements)[i] = oci_date;
                        zend_hash_move_forward(hash);
                } else {
@@ -1927,7 +1927,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval *var, zend_long max_table_leng
                                PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
                                return NULL;
                        }
-       
+
                        ((OCIDate *)bind->array.elements)[i] = oci_date;
                }
                connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
index f1bee56b8467c09ac956964aa4426f2090638dd4..15a8647779414c159a5ae1a953301189cec12f21 100644 (file)
@@ -58,7 +58,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name(): OCI-21560: argument 3 is null, invalid, or out of range in %s on line %d
 
 Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
index f70ebb3f617b615431682ab9dd48b7a143147bae..2bf39b586583840c98a72a44aae36495fcedd53b 100644 (file)
@@ -58,7 +58,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name(): Maximum array length must be greater than zero in %s on line %d
 
 Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
index 0de8e68187fc7b5dc263a3a94d2631b3d52ba50b..0979f4340f0dc88ccc74caaab8e65b75e5bc22e8 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_execute(): ORA-01403: %s
 ORA-06512: at "%s.ARRAY_BIND_003_PKG", line %d
 ORA-06512: at line %d in %sarray_bind_003.php on line %d
index 297229cab8a91521bde5e8c8144699c1cb2c864e..d9dfb01548e1aa039d4134853070fad4ecb830f2 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_execute(): ORA-01403: %s
 ORA-06512: at "%s.ARRAY_BIND_004_PKG", line %d
 ORA-06512: at line %d in %sarray_bind_004.php on line %d
index 31d368d661c177fc082beba5445dbb931a34e99d..b9a8b8c8203c55ecb2db91d26f991c2699e0080b 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(0) ""
index f2239f9d19f72f97f50d8230a16d80a4f69a4add..56db1aea619e1a21663a2db2407ac3fdee728b1a 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(4) "five"
index a3c63bca86e829e8fcd654c8ecb2a42ca05daaaf..7cde333aaddb11d04afd8ad95dc31413eb3b4b2d 100644 (file)
@@ -58,7 +58,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name(): Unknown or unsupported datatype given: -1 in %s on line %d
 
 Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
index 512ce053743f4aff492b36a5cfe471198180a1c6..5b1975cd1845a5ad61c956208929f31b7d200690 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_execute(): ORA-06550: line %d, column %d:
 PLS-00418: %s
 ORA-06550: %s
index 8e83b0982c4f1a03b7baa95768725291978ca20c..64b2e8cded2473623f7bdaa28b14bfeb4cb4b730 100644 (file)
@@ -11,7 +11,7 @@ var_dump(oci_bind_array_by_name($c, ":c1", $array, 5, 5, SQLT_CHR));
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name(): supplied resource is not a valid oci8 statement resource in %s on line %d
 bool(false)
 Done
index ede82c97fce9bf5e6dcffd9250051c848a3f5326..b5ba85938c5a95e152d4243a115a658e6e2c61cc 100644 (file)
@@ -19,7 +19,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name(): ORA-01036: illegal variable name/number in %s on line %d
 array(5) {
   [0]=>
index 90631619bcdd6205c0e673878c9327276d7b2a48..164821c221aea01bf9430df27350e66352aac873 100644 (file)
@@ -58,7 +58,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name(): You must provide max length value for empty arrays in %s on line %d
 
 Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d
index 38e1701a4b86cce1e44232b4cd2ab121b73befc5..e2b74a9ce987bcc5031a886f9aff6db4b70053e3 100644 (file)
@@ -19,7 +19,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name(): Invalid max length value (-10) in %s on line %d
 array(0) {
 }
index 4da9d8bbed81ac9545a333b8485e26f494d11423..44d4bd1e6de5799324d3a7578db707ae4d07e869 100644 (file)
@@ -22,7 +22,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_bind_array_by_name() expects at most 6 parameters, 7 given in %s on line %d
 NULL
 
index 8a88aff33be0b2e7e579cef01e4624290a220e37..51224bc3e070b8ddd2f36de7eb7f2b4dc8c6f35c 100644 (file)
@@ -60,7 +60,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   int(5)
index cc48779fd192c54f706db7d801bf26843d720204..75d2dbb3ba0ffab8466aa6abee98cd3ba8f7de3e 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(9) "05-NOV-05"
index 8e1aceaa06bc15d234961c2b71c5ef7ebd17b3c1..c0228539a19449cb16c9475e96905f1624767739 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(9) "05-NOV-05"
index a7cc87bc6831349ac1a48f834a8fbb0caa833b17..dbd1437696b40588b93a55870f7065add58eedf8 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   float(5.9999)
index 082262594bb14e68e0a2d022389af1f46defeaab..c342c0eb58f70d6bfc462f344d0f083a0e1676a6 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   float(5.9999)
index 08574779710c674ea022c5172fc1ba6d6ecdbaac..19fa3bf2ac113ecae72e913038207f985eec919a 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   int(5)
index 7a784bac61f1cddd3802834f36d78284f9b16253..b730cb2f204564fe0f3227e8ad77476522463b68 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   int(5)
index bda452fd028e623d56ec0750becc4cf6bb6d0433..70c148afcf379f3778b86bf368d262e75366c076 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(4) "five"
index 9444786cbe15979539882f79a07a66bc28e38b13..aabed16d4fb2581b8efaa0d43021cee410984935 100644 (file)
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(4) "five"
index 84ef14d95741f927f725917f0289ffd0b82f3022..477bb1422f3639ccdc927eb1ec78b1b1da39aab7 100644 (file)
@@ -26,7 +26,7 @@ $stmtarray = array(
        "insert into bind_char_tab values (2, NULL, 'abc')",
        "insert into bind_char_tab values (3, NULL, 'abc       ')"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
@@ -196,7 +196,7 @@ function do_e_q($s)
 $stmtarray = array(
        "drop table bind_char_tab"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
index 317a1db901dd94c44ac431a49792743d67f627ae..7a97213cad44be0fcae4ab105715819c902a330d 100644 (file)
@@ -28,7 +28,7 @@ $stmtarray = array(
        "insert into bind_char_tab values (2, NULL, 'abc')",
        "insert into bind_char_tab values (3, NULL, 'abc       ')"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
@@ -198,7 +198,7 @@ function do_e_q($s)
 $stmtarray = array(
        "drop table bind_char_tab"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
index 3f925e3bbd8d8f69afc06cc1be4dce7ee54b95b2..5ab03553b793672becc18efcb12ceb378efb13db 100644 (file)
@@ -25,7 +25,7 @@ $stmtarray = array(
        "create table bind_char_tab (id number, c1 date)",
        "insert into bind_char_tab values (1, '2008-04-20')",
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
@@ -85,7 +85,7 @@ function do_e_q($s)
 $stmtarray = array(
        "drop table bind_char_tab"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
index 2395b83b8867abee0676cf67b1e7670714454f67..00831111b6e4b94a9731f4081b78163dc07ba02d 100644 (file)
@@ -25,7 +25,7 @@ $stmtarray = array(
        "create table bind_char_tab (id number, c1 date)",
        "insert into bind_char_tab values (1, '2008-04-20')",
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
@@ -85,7 +85,7 @@ function do_e_q($s)
 $stmtarray = array(
        "drop table bind_char_tab"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
index 4ab77c6a5c06e5abaa9954813b8b0763f4a3b43b..3c3d3b36dc551ef4f8b827fd0576565111ce12d4 100644 (file)
@@ -22,7 +22,7 @@ require(dirname(__FILE__).'/connect.inc');
 $stmtarray = array(
        "create or replace function bind_char_3_fn(p1 char) return char as begin return p1; end;",
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
index 0e380ec5f082952c7a97615837d9f961c8fe65ee..60d7ac6c9f689090a509c138d3d913cf5e41b8f1 100644 (file)
@@ -24,7 +24,7 @@ require(dirname(__FILE__).'/connect.inc');
 $stmtarray = array(
        "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;",
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
index cc1276181da0e9a76a6cea48f12789c2e4465e25..9bc0ddf428da125629e8520b35b39f2f393cbf04 100644 (file)
@@ -24,7 +24,7 @@ require(dirname(__FILE__).'/connect.inc');
 $stmtarray = array(
        "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;",
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run Test
index 0b9d2b99e0ee6cbce9b9c3581e5d1fe55dd5b9d5..3058c1bcaec2e4114901ec0209cf6d6fa71613d4 100644 (file)
@@ -16,7 +16,7 @@ NLS_LANG=
 <?php
 
 require(dirname(__FILE__).'/connect.inc');
-       
+
 $stmtarray = array(
     "drop sequence myseq",
     "drop table mytab",
@@ -53,7 +53,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 string(1) "1"
 string(1) "2"
 string(1) "3"
index d2018783bc925932ee3c3be2e109d687af3a5e59..f7e224f45c142cc2c2b34a0d02b8c61faeaa2e47 100644 (file)
@@ -51,7 +51,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 string(1) "1"
 string(1) "2"
 string(1) "3"
index ee2f7b52aa5e6d1ad68516784883313275a0adbc..76188153e584e12e626b0dee5330c44b4b55b6d3 100644 (file)
@@ -16,7 +16,7 @@ NLS_LANG=
 <?php
 
 require dirname(__FILE__).'/connect.inc';
-       
+
 $stmtarray = array(
     "drop sequence myseq",
     "drop table mytab",
@@ -55,7 +55,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 string(1) "1"
 string(1) "2"
 string(1) "3"
index a50b3e2613291d8859499c3fcd0c56ee674129a3..0a0cc44845c5532c6974ab0d95a9e2aad7ef0871 100644 (file)
@@ -16,7 +16,7 @@ NLS_LANG=
 <?php
 
 require dirname(__FILE__).'/connect.inc';
-       
+
 $stmtarray = array(
     "drop sequence myseq",
     "drop table mytab",
@@ -55,7 +55,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 string(1) "1"
 string(1) "2"
 string(1) "3"
index e291067088663c083c5d361d663a435c91b7371e..aafdf61e73180d9cf3a327eebd763d657ad1868b 100644 (file)
@@ -6,7 +6,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters)
 <?php
 
 require dirname(__FILE__).'/connect.inc';
-       
+
 $create_st = array();
 $create_st[] = "drop sequence myseq";
 $create_st[] = "drop table mytab";
@@ -49,7 +49,7 @@ foreach ($create_st as $statement) {
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 int(1)
 int(2)
 int(3)
index ed9d5a1fe6d43d69de1650bc7e34dd171f7cf528..a88f29807d219e80554d55fe5095c6679fe4419c 100644 (file)
@@ -16,7 +16,7 @@ NLS_LANG=
 <?php
 
 require dirname(__FILE__).'/connect.inc';
-       
+
 $create_st = array();
 $create_st[] = "drop sequence myseq";
 $create_st[] = "drop table mytab";
@@ -51,7 +51,7 @@ oci8_test_sql_execute($c, $drop_st);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 string(1) "1"
 string(1) "2"
 string(1) "3"
index 550d89fdcc52f39e7347a7b883e5ed574e3cdeeb..ff21d23a2a97e9e1ceca05681c6423adaafde76d 100644 (file)
@@ -14,7 +14,7 @@ if (!(isset($matches[0]) && $matches[1] < 12)) {
 <?php
 
 require dirname(__FILE__).'/connect.inc';
-       
+
 $create_st = array();
 $create_st[] = "drop sequence myseq";
 $create_st[] = "drop table mytab";
@@ -49,7 +49,7 @@ oci8_test_sql_execute($c, $drop_st);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 string(1) "1"
 string(1) "2"
 string(1) "3"
index 906195c60f3c98116665ceb5207d959ab5dc6401..925433659b488828267d11f2a248ba83f80a1029 100644 (file)
@@ -9,7 +9,7 @@ require(dirname(__FILE__).'/skipif.inc');
 <?php
 
 require(dirname(__FILE__).'/connect.inc');
-               
+
 // Initialize
 
 $stmtarray = array(
@@ -19,7 +19,7 @@ $stmtarray = array(
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run test
-       
+
 $collection = oci_new_collection($c, "BUG32325_T");
 
 $sql = "begin
@@ -45,7 +45,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 int(4)
 float(2)
 float(3)
index 399391b8e98fa6a6c5ce6e39a5c0c13c00456c31..4c000d022b63e5a8cb186a92cf0b858c1ae9514a 100644 (file)
@@ -33,7 +33,7 @@ $s1 = oci_parse($c, "drop table test_nclob");
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 array(1) {
   ["NC"]=>
   object(OCI-Lob)#%d (1) {
index ec382d27ba08e8baa3e98efe9acd3c651f2dbfaf..cd68b66f34dad5871e62718e70446cb4bfc699fb 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 
 function f($conn)
index da4a8968f3687698ebb1bc357b5d527ce669b305..e1788c46c8d2901e7d7e1e6a89b0c1fd57ec8302 100644 (file)
@@ -31,7 +31,7 @@ $clob = oci_new_descriptor($c, OCI_D_LOB);
 oci_bind_by_name($stmt, ':data', $clob, -1, OCI_B_CLOB);
 $clob->writetemporary("<MYTAG/>", OCI_TEMP_CLOB);
 $success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS);
-oci_free_statement($stmt);     
+oci_free_statement($stmt); 
 $clob->close();
 
 // Query back the change
index b9b491cac065caa23e0a7c646e656c059ad1925e..642414f9a35b44b6b866f97191953f3590fad62d 100644 (file)
@@ -44,7 +44,7 @@ var_dump($strings);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(1) "A"
index 0664510146e00bc60b5a9e33417248e08a2d67de..4187de8fed16f0bff2cb03aeaa2e6b6f7dc7ce22 100644 (file)
@@ -24,7 +24,7 @@ var_dump($bv);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 NULL
 int(0)
 Done
index b7abcf5214bead67e7611d1c072dd7c43ecd160a..9fdcb14b7d0e551915ce53145dc8fe9b3aeb56d0 100644 (file)
@@ -42,7 +42,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   string(3) "one"
index 29f579448e294ccdadca302e8eb7394a8a2efd07..a7606819f3bc63d2c19765b2eb80fef040e6f4f4 100644 (file)
@@ -51,7 +51,7 @@ $stmtarray = array(
        "insert into bug41069_tab (c1, c2, c3, c4, c5, c6, c7, c9, c10, c12, c15)       values
        (113, 'aaaaaaa', 'bbbbbbbbbb', 'cccccc', 'e', 'f', 'dddd', '12/04/2006', '12/04/2006', 2224, 'zzzzzzz')"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 
index 6171127591e9b033d9c15b1cd9bae175ef9d36be..618836da58f9e89d79843d31da442a3f665df822 100644 (file)
@@ -102,27 +102,27 @@ function dropxmltab($c)  // delete table
 function fillxmltab($c)
 {
        for ($id = 1; $id <= 100; $id++) {
-               
-               // create an XML element string with random data                
+
+               // create an XML element string with random data
                $s = "<data>";
                for ($j = 0; $j < 128; $j++) {
-                       $s .= rand();           
+                       $s .= rand();
                }
-               $s .= "</data>\n";              
+               $s .= "</data>\n";
                for ($j = 0; $j < 4; $j++) {
                        $s .= $s;
-               }               
+               }
                $data = "<?xml version=\"1.0\"?><records>" . $s . "</records>";
-               
+
                // insert XML data into database
-               
+
                $stmt = oci_parse($c, "insert into bug43497_tab(id, xml) values (:id, sys.xmltype.createxml(:xml))");
                oci_bind_by_name($stmt, ":id", $id);
                $clob = oci_new_descriptor($c, OCI_D_LOB);
                oci_bind_by_name($stmt, ":xml", $clob, -1, OCI_B_CLOB);
                $clob->writetemporary($data);
                oci_execute($stmt);
-               
+
                $clob->close();
                $clob->free();
        }
index b25d393ee23821168d1c02c9e889d63036a89856..21a0cf8a3f99ff5f1bd8aeb69f12497746700906 100644 (file)
@@ -89,7 +89,7 @@ $statement = oci_parse($c, "DROP TABLE BIND_TEST");
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 Test 1
 array(5) {
   [0]=>
index c49dd0ee03d72a33f92aea53c3d0e71ce32dc4b7..fc548d26c1dc860794baaf3f7448514fdbe2cffb 100644 (file)
@@ -9,7 +9,7 @@ require(dirname(__FILE__).'/skipif.inc');
 <?php
 
 require(dirname(__FILE__).'/connect.inc');
-               
+
 // Initialize
 
 $stmtarray = array(
@@ -23,7 +23,7 @@ $stmtarray = array(
 oci8_test_sql_execute($c, $stmtarray);
 
 // Run test
-       
+
 $sql = "select col1,col2,col3,col4,col5,col6,col7,col8,col9 from bug71600_tab";
 
 echo "Test 1\n";
@@ -80,7 +80,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--     
+--EXPECT--
 Test 1
 Executing SELECT statament...
 Fetching data by columns...
index aed90fcaa710be2771b463a18e26a319cd07f52e..6f9d2b84736508ede4791ff217ae0ca3248ca0fb 100644 (file)
@@ -10,8 +10,8 @@ require dirname(__FILE__).'/connect.inc';
 oci_close($c);
 
 oci_connect($user, $password, $dbase);
-       
+
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 Done
index 5f502036f38f37115f01acab90227c329ab1e5cf..bb3f6aed751850164d6cbc0499208093d22bdc38 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 40d7e60228ccca3e96eeb51d29b2a10ff5233a36..38573bd3a881980c1e1b6326f4e88c54ecb4ba84 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 11dbe61f70c865d386401456400186cde6289439..620872c206dae4704c9b9b250c8520c68fce0be8 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index f3284584d309c26f2dd0f6718de0dc17e02b43a1..75a6c1209cb2694af04752b3b6c8839948fe6a97 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index da0650cfdd18eff79c18f0788135e66ec3e28f82..220ed179a565b49de140f680e4f67953be9f8d25 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 684da3d85d3899a33b3ac639dbd0d989e0d92380..ff121d78203ebed3004beceed842e575c6aa2ee7 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 3d47ee8830e566402305ab4f6d22f7d8a29c016d..c99a5abb3af3bb05b773a36f1f5dfcf79fbc92a3 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 08841447764a3ebe10587e68e5360ea7ed214bb8..1a20b37bc1049303c1164315d7ad020fff76839b 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index f85c98a907106b87d7a9adc5dd381494e93f04a3..2bb836ae1a4981ba968edefc386c2de80691df82 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 2132a06a0ae2bd0c5b1ac32b36d3dab77a7f5c09..27c2e66868c5fe3ee7fefd76d11305120f053e04 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index eca1c18ee4107031a97cc70c880ffb2d5aa35500..de3d46bd2937e2111ae73b392204917dae4f3aaa 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index ad04ad0be7d0c4d83ededd84fe69301741fbbb0d..4acde26e9ee316c2ed1316c146e33302a6527aa7 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 3618af4f73884db19bc7caa5787761d0ec6281f4..2d8a0f382b0fcf6131e8e1b70bc141481552cf8e 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index af82ff128562d080d95b3b06838cb8adde2b4fec..d88b14547e5a7b939dfb7608b2d1a004fc66f2cf 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 3f6dac744cb17d0991878aef35eec4d3f5d91362..1ba78007ccfd5fdec639d3684c88b32758c9175e 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 470ac1da73eeefe6b1b548d5cd6c05f3f1061524..ba3bee863ae2947e6ae445a8ae3ef8afcdc46904 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 7c07e3c61df629ca33938436d57d63cf1f57baeb..c988e4ffe623b1c0b850c35e9d82f0fe8d45b032 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index a08a95f052b9b642543856ea47b0bab06b92b9be..1aff12d76465a8b9ff134718a318c43218d271b0 100644 (file)
@@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql);
 @OCIExecute($statement);
 
 $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)";
-                       
+
 $statement = OCIParse($c,$ora_sql);
 OCIExecute($statement);
 
index 2df6b03382fb0d813670fcbe678e51bd56d5e8ad..2696217a0f843ab24ab6ac73f0c64480af16f49f 100644 (file)
@@ -74,7 +74,7 @@ var_dump($all);
 
 
 require(dirname(__FILE__).'/drop_table.inc');
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index dadffb6850e9f71e23bed0d490c9843c43be8803..0e3e08112acdc43180ea6adb67bb69a6d43a33df 100644 (file)
@@ -64,7 +64,7 @@ var_dump($all);
 
 
 require dirname(__FILE__).'/drop_table.inc';
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index c44b70aeca1642795fd5a6b093c83017f873883f..7897ddd4c9e2488ee1ceae35b751fcb5d04852c7 100644 (file)
@@ -62,7 +62,7 @@ foreach($values_array as $val ) {
        oci_set_module_name($c1,$val);
        oci_set_client_identifier($c1,$val);
        oci_set_client_info($c1,$val);
-       $r = oci_set_action($c1,$val);  
+       $r = oci_set_action($c1,$val);
        if ($r) {
                echo "Values set successfully to $val\n";
                foreach($attr_array as $attr) {
index 6ce4c533ba08c60f0ed49747a0f0383f8b1a4a3c..390ce1923eb4f9a8676fcae603889a034bbe3b02 100644 (file)
@@ -13,7 +13,7 @@ if (!empty($dbase)) {
 else {
        var_dump(oci_connect($user, $password));
 }
-       
+
 echo "Done\n";
 
 ?>
index 55f1734a5a2a2d1e1b5bd1c4fd2d2292d849ad0f..390c418a11fd04eb0dfd59ef824fd3f01e927a3d 100644 (file)
@@ -13,7 +13,7 @@ if (!empty($dbase)) {
 else {
        var_dump(ocilogon($user, $password));
 }
-       
+
 echo "Done\n";
 
 ?>
index b1f6653f120bad0817be584473281ab7fced29a9..55cc1710470067fdd8dc565e62d614978f14b66e 100644 (file)
@@ -18,7 +18,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                                                                               
+                                                
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index 660630bb6b6da0c51e58e2c9bbec4234eb5f3f44..76ed42ca178040c0f0ff20de83567a045585245a 100644 (file)
@@ -18,7 +18,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                                                                               
+                                                
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index d30fc6686da7ec7b660bd8aebf64b620fb90e9d4..6dc94792db74d97a43b0c91c307b914ae8fa8eb5 100644 (file)
@@ -20,7 +20,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                               
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index bb1ad4a7c654cfdce6c4ade95e693c1ea9056ec3..47e2b384b4476f556566d4d93bbc3c535fb35fe8 100644 (file)
@@ -20,7 +20,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                               
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index 4a82362127a52af25297cf64ca1a570f56e01c13..6e1c652ad5e189a1dc62ccedfd1a795fa6db9381 100644 (file)
@@ -20,7 +20,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                               
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index 25a951a79238aa0e2dda44162c33846ac4b7a2ea..f35f4e68b52d05418fd05d8b0d0a54279375320a 100644 (file)
@@ -20,7 +20,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                               
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index 0a2518d4e03787bd78e78229d15901fe51b7083c..325ce2fb99c5da4d8d1305ff58901b29516f9a14 100644 (file)
@@ -20,7 +20,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                               
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index 653bacc87945236f29672134a45311e2b7465fd4..6cc54a21bbef8765265678401362ddc91eef4bc3 100644 (file)
@@ -20,7 +20,7 @@ if (!empty($dbase))
        $c1 = oci_new_connect($user,$password,$dbase);
 else
        $c1 = oci_new_connect($user,$password);
-                                               
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
index 9149747cdbb5be41e4c1fcb513382ab873adf6fb..36963ab5a0f48f1a9996746dd57bcee95f02de7a 100644 (file)
@@ -21,7 +21,7 @@ var_dump($c5 == $c6);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 resource(%d) of type (oci8 connection)
 resource(%d) of type (oci8 connection)
 
index 4ccc2989c874179fd7ae59dd2fde31a05dd0f88d..0e4a37ca3a2796140fb021a8210879abd3b857c8 100644 (file)
@@ -28,7 +28,7 @@ if (!empty($dbase)) {
 else {
        var_dump(oci_connect($user, $password));
 }
-       
+
 ?>
 ===DONE===
 <?php exit(0); ?>
index 9962ecfcf844809270fca56fac5b112196376dd3..09f778362c1fcf7b13dcc6f046a085abca3c65a4 100644 (file)
@@ -31,7 +31,7 @@ if (!empty($dbase)) {
 else {
        var_dump(oci_connect($user, $password));
 }
-       
+
 ?>
 ===DONE===
 <?php exit(0); ?>
index 7e15bc5dd4de1aadbf091852fc79e4c3cd81a691..1bc7b37c2361814e84ff8778de6f9ead3935dea2 100644 (file)
@@ -24,7 +24,7 @@ if (!empty($dbase)) {
 else {
        var_dump(ocilogon($user, $password));
 }
-       
+
 ?>
 ===DONE===
 <?php exit(0); ?>
index 6371b3f909f089e4166bc1daed864b7c6339fd2f..07803b999655f7e6b062a089e38bb50c6f3400d4 100644 (file)
@@ -31,7 +31,7 @@ if (!empty($dbase)) {
 else {
        var_dump(ocilogon($user, $password));
 }
-       
+
 ?>
 ===DONE===
 <?php exit(0); ?>
index 66ab0f0d005f0a8699d4e9c4e11350ed2d316394..729726fdd6fb95493e9c99b17625d561596fd5e2 100644 (file)
@@ -15,7 +15,7 @@ if (!empty($dbase)) {
 else {
        oci_connect($user, $password);
 }
-       
+
 oci_internal_debug(false);
 
 ?>
index cc70c6ecb3c7cf4c8b9e87b91b70c4e6764d18fb..5d2934e4cb4015129e176e0443aebcfdb9e4a96c 100644 (file)
@@ -44,7 +44,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index cc70c6ecb3c7cf4c8b9e87b91b70c4e6764d18fb..5d2934e4cb4015129e176e0443aebcfdb9e4a96c 100644 (file)
@@ -44,7 +44,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index bc788293657dbe0efd4a74323398ef5612a558cb..04fbd1a5a51a1e1cb2557010912ca44effb206cf 100644 (file)
@@ -44,7 +44,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index d8a76dbb079f4e3bdbb45951907598fcba1be5d5..33e91150b6a1cc5867b4a31ab3af9ca069d873ab 100644 (file)
@@ -45,7 +45,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index 086cc7275c4dd29bf498a88bb531922a3987bd17..67cff225c190bf6ffaf91b3063875e1df7d849d3 100644 (file)
@@ -14,7 +14,7 @@ $stmtarray = array(
        "drop table phptestrawtable",
        "create table phptestrawtable( id number(10), fileimage raw(1000))"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 $stmt = oci_parse ($c, "insert into phptestrawtable (id, fileimage) values (:id, :fileimage)");
index 70426f61b495bd5ab99d1dda370a8353d7ae54ba..701c89db5490c9bcdbf09ca46582cbf9d40f90fb 100644 (file)
@@ -14,7 +14,7 @@ $stmtarray = array(
        "drop table phpdefblobtable",
        "create table phpdefblobtable (id number(10), fileimage blob)"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 // Load data
@@ -78,7 +78,7 @@ while (oci_fetch($stmt)) {
 $stmtarray = array(
        "drop table phpdefblobtable"
 );
-                                               
+
 oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
index 9a4c650c479bf146bd248fa473301c0bd4661d09..0b4aeb09f70c9bdd1b87d05fce8fe2a40d5409fe 100644 (file)
@@ -41,7 +41,7 @@ require dirname(__FILE__).'/drop_table.inc';
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 array(1) {
   ["BLOB"]=>
   object(OCI-Lob)#%d (1) {
index 6d56f9be5ca5c49413c0c822b4132f94d4ced4ad..9ec5f4b96de825003e0558fcdde914010d177b9f 100644 (file)
@@ -92,7 +92,7 @@ foreach ($values_array as $val ) {
        if ($c1) {
                get_edit_attr($c1);
                oci_close($c1);
-       }       
+       }
 }
 
 echo "\n\n**Test 1.5 - Negative case with an invalid string value. *********\n";
index 52d515ffc4c6c799766cc84a67e27bba7ddd7a23..b318ee48fcc767eb5eadb145221fb7a8b69e52ae 100644 (file)
@@ -15,7 +15,7 @@ var_dump(oci_fetch_array($stmt));
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_execute(): ORA-00942: %s in %s on line %d
 bool(false)
 
index 90570cae80ac7a37b03519cf3170277dc0234ff9..ffa97f0f2fe8de2f03dbbe8ffd83bbd3fd2d5d15 100644 (file)
@@ -14,6 +14,6 @@ oci_execute($stmt, -1);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: oci_execute(): Invalid execute mode given: -1 in %s on line %d
 Done
index 6fdec313f1860dbb5b86821c146765036fcf4988..a2906034874ebeb083190a487573d91bbc8a5cb8 100644 (file)
@@ -43,7 +43,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index b8155b170b0aa8a787fb0d98d6cea7120c182c8e..fe34bd8ececcbfb9e76df6f3a4d54f68ed87de9f 100644 (file)
@@ -45,7 +45,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECTF--
index 00e747cc35721d0fcf56722dd73a16a405135c55..20afe5967cd02b86dfdea3d98d8cb52aa0d042b5 100644 (file)
@@ -45,7 +45,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index 261c46f38b8f74eb623eebec9df30571e61c815c..ca43348c2b468602f95b9df3ffe1abf2d2ce29ce 100644 (file)
@@ -50,7 +50,7 @@ var_dump(oci_fetch_all($s, $all, 0, 1, OCI_BOTH));
 var_dump($all);
 
 require dirname(__FILE__).'/drop_table.inc';
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index 03640e5901cd98ac073dd36ff80ba300addfc3a8..9b67f27e8f50d5039b4213e507a2f8ed5c66e775 100644 (file)
@@ -97,7 +97,7 @@ while ($row = oci_fetch_array($s, OCI_NUM+OCI_RETURN_NULLS)) {
 }
 
 require dirname(__FILE__).'/drop_table.inc';
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index 05fc78aa019887c231c52d06841acda1d6c9a70b..68e5f9cfaece6c4946f531c6ee7da4ead9b87694 100644 (file)
@@ -58,7 +58,7 @@ var_dump(ocifetchinto($s, $all, OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS));
 var_dump($all);
 
 require dirname(__FILE__).'/drop_table.inc';
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index 39b1dc72b9c7778c2121761293740685a5831f19..2d7254158071ff31f4985c0c246dcf7dafe5ca7b 100644 (file)
@@ -46,7 +46,7 @@ var_dump(ocifetchinto($s, $all, 1000000));
 var_dump($all);
 
 require dirname(__FILE__).'/drop_table.inc';
-       
+
 echo "Done\n";
 ?>
 --EXPECTF--
index a6967fa787f87bd0fac046f5c62286bdc56b12cc..432239d12992264c7b5f5047e0352f8b3b794697 100644 (file)
Binary files a/ext/oci8/tests/lob_001.phpt and b/ext/oci8/tests/lob_001.phpt differ
index 95193bccf65f0cbd824d9ae5de8cf08c946bfd12..b0b1d31af4a9c6299938f859c95a9d277a988cd1 100644 (file)
Binary files a/ext/oci8/tests/lob_003.phpt and b/ext/oci8/tests/lob_003.phpt differ
index 03d4201521212d84be2d076167dbed31988cc5ff..a363199776cccc519d514a89b382a71d12176fa6 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index b43ce7ed2551fcd8efc642b768b929b738fd42bb..e482caafd15d0219418ee06100787561e4bf2fc7 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 38e8d8b15e5776221ce1ebb65ccd284f73790429..6a38df5e437b141bb9601ebd4ef2a9a02765d53d 100644 (file)
Binary files a/ext/oci8/tests/lob_006.phpt and b/ext/oci8/tests/lob_006.phpt differ
index 3553502abb28c2c9e2570ba17c11f0e0d7d56edc..934f012862a26a5fb0165928c8ace91dbb2b15fa 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 38f03fd3c19e3a9a717b94829b98be1cf410124d..238f619507801209341c2332e4314bdff6bf70b5 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 96bcb5f3d623579548088dbf33f369a9c0ee6bde..50a9b02c05b5a93d83b18ba57010fc2e5a379434 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index e89244d662d86e01294c01ffb7e2811f961cec3c..f82faf1075302423c5b05e17ec4857eb562cc594 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index b1d1b3562320cd94c0247cf16ca3e0afd6e69043..bd516e013bb08997cf61e6c24c19f5523c537148 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index d85440a062d3ee3edaa88e757be2906d65c2b504..480049cfab4a7f7b8b40a22d557c64e7904c182f 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index b345e60925c20a5994decd2d50eac6ef2faf6e56..9120fa76c87ac29f8d3685c32128156eebdedb89 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 7d8ede6deba8600a7d7f1bbdba97c89b5a58a1cb..b73e76fd4f814ec4cbb7b5e4a426fec0bdb15d1c 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index cd9e4da634bad111f804b83c4e1ec2ee5fc30da6..841961a29ea234f0c09d331eba5a141f42cc4088 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 9f3b2f690f4549dbac7fdf5a3ababad58ee74379..70f93b90e1fc9e44e6387360db078d4e6cc5045e 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 
 $drop = "DROP table lob_test";
index 852c4bfcc7b1e9a0bad6e459613d45f909f1cb80..ada2dde7e0618aa728c871237af95fe6de30c51a 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 
 $c = oci_pconnect($user, $password, $dbase);
index 94c888cb6455443fcf54128a397aeb6479f288df..89a02c1d08aa3b864b9c1dcaaf5743b7eecfd78a 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require(dirname(__FILE__).'/connect.inc');
 
 // Initialization
index e0e4bf5d4edcaf4a9dcc743c680138019d38e926..fb941851bd797241c0d73120c7941bb79a413670 100644 (file)
Binary files a/ext/oci8/tests/lob_019.phpt and b/ext/oci8/tests/lob_019.phpt differ
index 5f430675acf60c91ff8be5de1d4c657fc01af54a..c4ad5276b1b3df6bfca23fee6ba8983295021a89 100644 (file)
Binary files a/ext/oci8/tests/lob_020.phpt and b/ext/oci8/tests/lob_020.phpt differ
index 0cf73c36ebddb2b3629f86458b761aa71f2d83fa..9eee7abd6c7a9780cb0501b41b38ed8e6eb8e537 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 0c548b3fbb10159558f3e629241d01ba182515c4..77a9b064e6d0c2c45822b93a08960b9e061f0279 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 
 $drop = "DROP table lob_test";
index 14ae75eee6b7342e3c441ca685d65beb319fa584..09d04f84403e703c76b881130ab128359b770df8 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 25642991dae98ad0eedf85f78e6402b65f80470a..958cb3ed1362f91788c89ca77a5bfea381da5582 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 12e46ece9542724e5fdaca0a0abdb903ebfff64e..7260d9820befbe276a81e28c82bfeb88182ee67a 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index a30a6eb049bbca94fc65cc625a6e2376532a8c90..5799bc5277a6e19ef1e924094800cec21b26b061 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 61656faf59cc3365aa3a28b6a2a1d52ed2ec3650..51868bd8bec489914fc1c872e2ebdddacebd0426 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
@@ -46,7 +46,7 @@ for ($i = 5; $i >= 0; $i--) {
        $row = oci_fetch_array($s);
        var_dump($row['BLOB']->load());
        var_dump($row['BLOB']->truncate(($i-1)*10));
-       
+
        oci_commit($c);
 }
 
index ee99e4ceecaebabfc87c32231e36c410c6be15eb..99168442922f846ea1cd2af87a8ae939364029aa 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 4b6f3d08f17bbdd5a7516918bdcbb7376b896f9c..f3077997d7342d1f28dade9135d4285dc94c545c 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index b27156668d86a643a7d845063ce99b2f683dc5c1..05bafa8f588a6b05e957f82b10d9d6d524a8767c 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 70cdd0ba6eb36e7a0bbf3a89bf16d77132ca6244..e911d343fbe996c79e84dc3e47d60c999e10178a 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 7ab6678e9eff87e9a76be2eec0fd11693400ca0a..665b760d1c7af7598577a771df4ed940c7de70c1 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
index 00f280524cbf0384e5f4595421617bc25ad5096b..fd87c5de75f5f0615406afddd7ba497e904743ca 100644 (file)
@@ -39,9 +39,9 @@ var_dump($blob->import("does_not_exist"));
 var_dump($blob->saveFile("does_not_exist"));
 
 require(dirname(__FILE__).'/drop_table.inc');
-                                               
+
 echo "Done\n";
-                                               
+
 ?>
 --EXPECTF--
 object(OCI-Lob)#%d (1) {
index a49c0b757101081051e5e314f657702d5bdd2d00..4ed661c0e6124c78e958018f37f82b7924914115 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require(dirname(__FILE__).'/connect.inc');
 
 // Initialization
index 186e106beae8bedccf731175f863baca4c54c8ae..59db20fc130d631acce22e7283a474816b24a90a 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 
 $blob = oci_new_descriptor($c,OCI_D_LOB);
index a1cf843dfee53680d1d524b4724b89e7059ffc7c..de1e30630a028295fc7afbd2b27f8cba403bd4ff 100644 (file)
@@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 
 $blob = oci_new_descriptor($c,OCI_D_LOB);
index 42df6905db7192f9c652976444e56df7baffa4b0..9ec102ad0d19240ed0f33db969ed97e5f1234933 100644 (file)
@@ -13,7 +13,7 @@ if (getenv("USE_ZEND_ALLOC") === "0") {
 memory_limit=10M
 --FILE--
 <?php
-       
+
 require dirname(__FILE__).'/connect.inc';
 require dirname(__FILE__).'/create_table.inc';
 
@@ -50,5 +50,5 @@ require dirname(__FILE__).'/drop_table.inc';
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Fatal error: Allowed memory size of 10485760 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
index 884cd35a4cc6094c954db73aed596ab6d9a973e1..1bdfc3c90f673612ee32268d2d41b812a7a97245 100644 (file)
@@ -4,7 +4,7 @@ reusing persistent connections
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --FILE--
 <?php
-               
+
 require dirname(__FILE__)."/connect.inc";
 
 var_dump(oci_pconnect($user, $password, $dbase));
@@ -16,7 +16,7 @@ var_dump(oci_connect($user, $password, $dbase));
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 resource(%d) of type (oci8 persistent connection)
 resource(%d) of type (oci8 persistent connection)
 resource(%d) of type (oci8 persistent connection)
index ac43771c6be1d27c8ab2f3d3c5b557443812caab..7f50993a6485e14b5152f6337d143b8295e7d975 100644 (file)
@@ -46,7 +46,7 @@ $stmtarray = array(
 );
 
 oci8_test_sql_execute($c, $stmtarray);
-       
+
 echo "Done\n";
 ?>
 --EXPECT--
index 3b72f2021a3eb7f543ea15737940b858f22e5da3..3e06283421db7a185bc2835e05c59baae579f8da 100644 (file)
@@ -4,7 +4,7 @@ privileged connect tests
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --FILE--
 <?php
-               
+
 require dirname(__FILE__)."/connect.inc";
 
 oci_connect("", "", "", false, OCI_SYSOPER);
index 768b0c20d3aa76a81a739febe7d616a4082f07bb..d33711a91a08be9844bcd8dc5f7ad8833121463f 100644 (file)
@@ -6,7 +6,7 @@ privileged connect tests
 oci8.privileged_connect=1
 --FILE--
 <?php
-               
+
 require dirname(__FILE__)."/connect.inc";
 
 oci_connect("", "", "", false, OCI_SYSOPER);
index 450c81a877e0ec11640f6ae7786028d944a5a382..23e5923b8e2514f06be9e4f8b72692ccec7ee48f 100644 (file)
@@ -15,7 +15,7 @@ var_dump(oci_fetch_array($stmt, OCI_RETURN_NULLS));
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 array(2) {
   [0]=>
   NULL
index 6cbb5aaad004fb41d2daa6d777cd8f89460e9ed0..1c4b7d7d268a76495abc37fa770b059f01c2c793 100644 (file)
@@ -13,7 +13,7 @@ if (!empty($dbase)) {
 else {
        var_dump($c = oci_connect($user, $password));
 }
-       
+
 $v = oci_server_version($c);
 var_dump(str_replace("\n", "", $v));
 
index d903b8de22b34949ee1e8a525f4f2cd6d023d77c..8ab9ddc8c1005521ace5073a220465db56f0d733 100644 (file)
@@ -24,7 +24,7 @@ var_dump(oci_fetch_array($stmt));
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 array(2) {
   [0]=>
   string(1) "4"
index a779bba34089fc9a7368c546b420e762928c0e0c..cb90e4a51439a61569fa8c4afb01c2e05f592eb5 100644 (file)
@@ -4,7 +4,7 @@ uncommitted connection
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --FILE--
 <?php
-               
+
 require dirname(__FILE__)."/connect.inc";
 
 $stmt = oci_parse($c, "select 1 from dual");
@@ -12,5 +12,5 @@ oci_execute($stmt, OCI_DEFAULT);
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 Done