Skip to content

Commit 3765233

Browse files
cjbjcjbj
committed
And strip trailing tabs too...
1 parent bdd67d8 commit 3765233

File tree

151 files changed

+462
-462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+462
-462
lines changed

‎ext/oci8/oci8.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,7 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char
18721872
if ((tmp_val != NULL) && (Z_TYPE_P(tmp_val) == IS_RESOURCE)) {
18731873
tmp = Z_RES_VAL_P(tmp_val);
18741874
}
1875-
1875+
18761876
if ((tmp_val != NULL) && (tmp != NULL) &&
18771877
(ZSTR_LEN(tmp->hash_key) == ZSTR_LEN(hashed_details.s)) &&
18781878
(memcmp(ZSTR_VAL(tmp->hash_key), ZSTR_VAL(hashed_details.s),

‎ext/oci8/oci8_collection.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
/* {{{ php_oci_collection_create()
4242
Create and return connection handle */
4343
php_oci_collection *php_oci_collection_create(php_oci_connection *connection, char *tdo, int tdo_len, char *schema, int schema_len)
44-
{
44+
{
4545
dvoid *dschp1 = NULL;
4646
dvoid *parmp1;
4747
dvoid *parmp2;
4848
php_oci_collection *collection;
4949
sword errstatus;
50-
50+
5151
collection = emalloc(sizeof(php_oci_collection));
5252

5353
collection->connection = connection;
@@ -195,7 +195,7 @@ php_oci_collection *php_oci_collection_create(php_oci_connection *connection, ch
195195
default:
196196
php_error_docref(NULL, E_WARNING, "unknown collection type %d", collection->coll_typecode);
197197
break;
198-
}
198+
}
199199

200200
/* Create object to hold return table */
201201
PHP_OCI_CALL_RETURN(errstatus, OCIObjectNew,
@@ -221,7 +221,7 @@ php_oci_collection *php_oci_collection_create(php_oci_connection *connection, ch
221221
PHP_OCI_REGISTER_RESOURCE(collection, le_collection);
222222
connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
223223
return collection;
224-
224+
225225
CLEANUP:
226226

227227
if (dschp1) {
@@ -230,7 +230,7 @@ php_oci_collection *php_oci_collection_create(php_oci_connection *connection, ch
230230
}
231231
connection->errcode = php_oci_error(connection->err, errstatus);
232232
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
233-
php_oci_collection_close(collection);
233+
php_oci_collection_close(collection);
234234
return NULL;
235235
}
236236
/* }}} */
@@ -241,7 +241,7 @@ int php_oci_collection_size(php_oci_collection *collection, sb4 *size)
241241
{
242242
php_oci_connection *connection = collection->connection;
243243
sword errstatus;
244-
244+
245245
PHP_OCI_CALL_RETURN(errstatus, OCICollSize, (connection->env, connection->err, collection->collection, (sb4 *)size));
246246

247247
if (errstatus != OCI_SUCCESS) {
@@ -259,7 +259,7 @@ int php_oci_collection_size(php_oci_collection *collection, sb4 *size)
259259
int php_oci_collection_max(php_oci_collection *collection, zend_long *max)
260260
{
261261
php_oci_connection *connection = collection->connection;
262-
262+
263263
PHP_OCI_CALL_RETURN(*max, OCICollMax, (connection->env, collection->collection));
264264

265265
/* error handling is not necessary here? */
@@ -296,7 +296,7 @@ int php_oci_collection_append_null(php_oci_collection *collection)
296296

297297
/* append NULL element */
298298
PHP_OCI_CALL_RETURN(errstatus, OCICollAppend, (connection->env, connection->err, (dvoid *)0, &null_index, collection->collection));
299-
299+
300300
if (errstatus != OCI_SUCCESS) {
301301
errstatus = php_oci_error(connection->err, errstatus);
302302
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -341,7 +341,7 @@ int php_oci_collection_append_date(php_oci_collection *collection, char *date, i
341341
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
342342
return 1;
343343
}
344-
344+
345345
connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
346346
return 0;
347347
}
@@ -358,7 +358,7 @@ int php_oci_collection_append_number(php_oci_collection *collection, char *numbe
358358
sword errstatus;
359359

360360
element_double = zend_strtod(number, NULL);
361-
361+
362362
PHP_OCI_CALL_RETURN(errstatus, OCINumberFromReal, (connection->err, &element_double, sizeof(double), &oci_number));
363363

364364
if (errstatus != OCI_SUCCESS) {
@@ -396,7 +396,7 @@ int php_oci_collection_append_string(php_oci_collection *collection, char *eleme
396396
OCIString *ocistr = (OCIString *)0;
397397
php_oci_connection *connection = collection->connection;
398398
sword errstatus;
399-
399+
400400
PHP_OCI_CALL_RETURN(errstatus, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element, element_len, &ocistr));
401401

402402
if (errstatus != OCI_SUCCESS) {
@@ -433,12 +433,12 @@ int php_oci_collection_append(php_oci_collection *collection, char *element, int
433433
if (element_len == 0) {
434434
return php_oci_collection_append_null(collection);
435435
}
436-
436+
437437
switch(collection->element_typecode) {
438438
case OCI_TYPECODE_DATE:
439439
return php_oci_collection_append_date(collection, element, element_len);
440440
break;
441-
441+
442442
case OCI_TYPECODE_VARCHAR2 :
443443
return php_oci_collection_append_string(collection, element, element_len);
444444
break;
@@ -478,7 +478,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
478478
oratext buff[1024];
479479
ub4 buff_len = 1024;
480480
sword errstatus;
481-
481+
482482
ZVAL_NULL(result_element);
483483

484484
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
500500
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
501501
return 1;
502502
}
503-
503+
504504
if (exists == 0) {
505505
/* element doesn't exist */
506506
return 1;
@@ -514,7 +514,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
514514
switch (collection->element_typecode) {
515515
case OCI_TYPECODE_DATE:
516516
PHP_OCI_CALL_RETURN(errstatus, OCIDateToText, (connection->err, element, 0, 0, 0, 0, &buff_len, buff));
517-
517+
518518
if (errstatus != OCI_SUCCESS) {
519519
connection->errcode = php_oci_error(connection->err, errstatus);
520520
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -523,17 +523,17 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
523523

524524
ZVAL_STRINGL(result_element, (char *)buff, buff_len);
525525
Z_STRVAL_P(result_element)[buff_len] = '\0';
526-
526+
527527
return 0;
528528
break;
529529

530530
case OCI_TYPECODE_VARCHAR2:
531531
{
532532
OCIString *oci_string = *(OCIString **)element;
533533
text *str;
534-
534+
535535
PHP_OCI_CALL_RETURN(str, OCIStringPtr, (connection->env, oci_string));
536-
536+
537537
if (str) {
538538
ZVAL_STRING(result_element, (char *)str);
539539
}
@@ -554,15 +554,15 @@ int php_oci_collection_element_get(php_oci_collection *collection, zend_long ind
554554
case OCI_TYPECODE_SMALLINT: /* SMALLINT */
555555
{
556556
double double_number;
557-
557+
558558
PHP_OCI_CALL_RETURN(errstatus, OCINumberToReal, (connection->err, (CONST OCINumber *) element, (uword) sizeof(double), (dvoid *) &double_number));
559559

560560
if (errstatus != OCI_SUCCESS) {
561561
connection->errcode = php_oci_error(connection->err, errstatus);
562562
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
563563
return 1;
564564
}
565-
565+
566566
ZVAL_DOUBLE(result_element, double_number);
567567

568568
return 0;
@@ -588,7 +588,7 @@ int php_oci_collection_element_set_null(php_oci_collection *collection, zend_lon
588588

589589
/* set NULL element */
590590
PHP_OCI_CALL_RETURN(errstatus, OCICollAssignElem, (connection->env, connection->err, (ub4) index, (dvoid *)"", &null_index, collection->collection));
591-
591+
592592
if (errstatus != OCI_SUCCESS) {
593593
connection->errcode = php_oci_error(connection->err, errstatus);
594594
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
@@ -634,7 +634,7 @@ int php_oci_collection_element_set_date(php_oci_collection *collection, zend_lon
634634
PHP_OCI_HANDLE_ERROR(connection, connection->errcode);
635635
return 1;
636636
}
637-
637+
638638
connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
639639
return 0;
640640
}
@@ -651,7 +651,7 @@ int php_oci_collection_element_set_number(php_oci_collection *collection, zend_l
651651
sword errstatus;
652652

653653
element_double = zend_strtod(number, NULL);
654-
654+
655655
PHP_OCI_CALL_RETURN(errstatus, OCINumberFromReal, (connection->err, &element_double, sizeof(double), &oci_number));
656656

657657
if (errstatus != OCI_SUCCESS) {
@@ -690,7 +690,7 @@ int php_oci_collection_element_set_string(php_oci_collection *collection, zend_l
690690
OCIString *ocistr = (OCIString *)0;
691691
php_oci_connection *connection = collection->connection;
692692
sword errstatus;
693-
693+
694694
PHP_OCI_CALL_RETURN(errstatus, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element, element_len, &ocistr));
695695

696696
if (errstatus != OCI_SUCCESS) {
@@ -728,12 +728,12 @@ int php_oci_collection_element_set(php_oci_collection *collection, zend_long ind
728728
if (value_len == 0) {
729729
return php_oci_collection_element_set_null(collection, index);
730730
}
731-
731+
732732
switch(collection->element_typecode) {
733733
case OCI_TYPECODE_DATE:
734734
return php_oci_collection_element_set_date(collection, index, value, value_len);
735735
break;
736-
736+
737737
case OCI_TYPECODE_VARCHAR2 :
738738
return php_oci_collection_element_set_string(collection, index, value, value_len);
739739
break;
@@ -768,7 +768,7 @@ int php_oci_collection_assign(php_oci_collection *collection_dest, php_oci_colle
768768
{
769769
php_oci_connection *connection = collection_dest->connection;
770770
sword errstatus;
771-
771+
772772
PHP_OCI_CALL_RETURN(errstatus, OCICollAssign, (connection->env, connection->err, collection_from->collection, collection_dest->collection));
773773

774774
if (errstatus != OCI_SUCCESS) {
@@ -798,7 +798,7 @@ void php_oci_collection_close(php_oci_collection *collection)
798798
connection->errcode = 0; /* retain backwards compat with OCI8 1.4 */
799799
}
800800
}
801-
801+
802802
zend_list_delete(collection->connection->id);
803803
efree(collection);
804804
return;

0 commit comments

Comments
 (0)