sniper Tue Jul 1 09:33:59 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/informix ifx.ec
Log:
MFH
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.69.2.18 php-src/ext/informix/ifx.ec:1.69.2.19
--- php-src/ext/informix/ifx.ec:1.69.2.18 Tue Jul 1 08:37:11 2003
+++ php-src/ext/informix/ifx.ec Tue Jul 1 09:33:59 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ifx.ec,v 1.69.2.18 2003/07/01 12:37:11 nobbie Exp $ */
+/* $Id: ifx.ec,v 1.69.2.19 2003/07/01 13:33:59 sniper Exp $ */
/* -------------------------------------------------------------------
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -2486,9 +2486,9 @@
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &result) == FAILURE) {
WRONG_PARAM_COUNT;
}
-
+
IFXG(sv_sqlcode) = 0;
-
+
ZEND_FETCH_RESOURCE(Ifx_Result, IFX_RES *, result, -1, "Informix Result",
le_result);
if (strcmp(Ifx_Result->cursorid, "") == 0) {
@@ -2883,7 +2883,7 @@
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &result) == FAILURE) {
WRONG_PARAM_COUNT;
}
-
+
IFXG(sv_sqlcode = 0);
ZEND_FETCH_RESOURCE(Ifx_Result, IFX_RES *, result, -1, "Informix Result",
le_result);
@@ -2899,8 +2899,8 @@
cursorid = Ifx_Result->cursorid;
statemid = Ifx_Result->statemid;
descrpid = Ifx_Result->descrpid;
-
- EXEC SQL set connection :ifx;
+
+ EXEC SQL set connection :ifx;
PHP_IFX_CHECK_CONNECTION(ifx);
EXEC SQL free :statemid;
@@ -3043,20 +3043,19 @@
if (*param && param != "") {
- /*
- * copy the filename in param to filename in loc_fname
- * otherwise we'll unlink non-temporary files
- *
- * loc_fname gets filled by php_intifx_init_blob_infile
- */
-
- if (Ifx_blob->BLOB.blob_data.loc_fname != NULL) {
- if (php_copy_file(param,
Ifx_blob->BLOB.blob_data.loc_fname TSRMLS_CC) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Can't create blob-resource file. File copy failed: %s", param);
+ /*
+ * copy the filename in param to filename in loc_fname
+ * otherwise we'll unlink non-temporary files
+ *
+ * loc_fname gets filled by php_intifx_init_blob_infile
+ */
+ if (Ifx_blob->BLOB.blob_data.loc_fname != NULL) {
+ if (php_copy_file(param,
Ifx_blob->BLOB.blob_data.loc_fname TSRMLS_CC) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Could not create blob-resource file. File copy failed: %s", param);
return -1;
}
- Ifx_blob->BLOB.blob_data.loc_size = -1;
- }
+ Ifx_blob->BLOB.blob_data.loc_size = -1;
+ }
}
}
@@ -3648,7 +3647,7 @@
if (ifx_check() >= 0) {
ret = s_da->sqld;
-
+
/*
* Thanks to DBD-Informix
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
