CVS update: php3/functions
| From: | thies | Date: | Mon, 15 Feb 1999 11:55:29 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-4100@lists.php.net to get a copy of this message | ||
Date: Monday February 15, 1999 @ 6:55
Author: thies
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv25644
Modified Files:
oci8.c
Log Message:
oci8_loadlob returns an unsigned 32-bit value, therefore negative return-code cannot be supported!!!
(and you cannot save a 0 byte lob to oracle anyhow)
Index: php3/functions/oci8.c
diff -c php3/functions/oci8.c:1.45 php3/functions/oci8.c:1.46
*** php3/functions/oci8.c:1.45 Mon Feb 15 06:28:37 1999
--- php3/functions/oci8.c Mon Feb 15 06:55:28 1999
***************
*** 32,38 ****
+----------------------------------------------------------------------+
*/
! /* $Id: oci8.c,v 1.45 1999/02/15 11:28:37 thies Exp $ */
#include "php.h"
#include "internal_functions.h"
--- 32,38 ----
+----------------------------------------------------------------------+
*/
! /* $Id: oci8.c,v 1.46 1999/02/15 11:55:28 thies Exp $ */
#include "php.h"
#include "internal_functions.h"
***************
*** 694,699 ****
--- 694,705 ----
value->type = IS_STRING;
value->value.str.len = loblen;
value->value.str.val = buffer;
+ } else if (mode & OCI_RETURN_NULLS) {
+ value->type = IS_STRING;
+ value->value.str.len = 0;
+ value->value.str.val = empty_string;
+ } else {
+ var_reset(value);
}
} else { /* return the locator */
object_init(value);
***************
*** 996,1008 ****
if (ociresult) {
oci8_error(connection->pError, "OCILobGetLength", ociresult);
! return -1;
}
*buffer = emalloc(loblen + 1);
if (! buffer) {
! return -2;
}
if (mydescr->type == OCI_DTYPE_FILE) {
--- 1002,1014 ----
if (ociresult) {
oci8_error(connection->pError, "OCILobGetLength", ociresult);
! return 0;
}
*buffer = emalloc(loblen + 1);
if (! buffer) {
! return 0;
}
if (mydescr->type == OCI_DTYPE_FILE) {
***************
*** 1013,1019 ****
if (ociresult) {
oci8_error(connection->pError, "OCILobRead: OCILobFileOpen", ociresult);
efree(buffer);
! return -3;
}
}
--- 1019,1025 ----
if (ociresult) {
oci8_error(connection->pError, "OCILobRead: OCILobFileOpen", ociresult);
efree(buffer);
! return 0;
}
}
***************
*** 1032,1038 ****
if (ociresult) {
oci8_error(connection->pError, "OCILobRead", ociresult);
efree(buffer);
! return -4;
}
if (mydescr->type == OCI_DTYPE_FILE) {
--- 1038,1044 ----
if (ociresult) {
oci8_error(connection->pError, "OCILobRead", ociresult);
efree(buffer);
! return 0;
}
if (mydescr->type == OCI_DTYPE_FILE) {
***************
*** 1042,1048 ****
if (ociresult) {
oci8_error(connection->pError, "OCILobRead: OCILobFileClose", ociresult);
efree(buffer);
! return -5;
}
}
--- 1048,1054 ----
if (ociresult) {
oci8_error(connection->pError, "OCILobRead: OCILobFileClose", ociresult);
efree(buffer);
! return 0;
}
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net