CVS update: php3/functions

Date: Friday May 21, 1999 @ 5:01 Author: thies Update of /repository/php3/functions In directory php:/tmp/cvs-serv5369 Modified Files: oci8.c Log Message: make SUN-C happy Index: php3/functions/oci8.c diff -u php3/functions/oci8.c:1.98 php3/functions/oci8.c:1.99 --- php3/functions/oci8.c:1.98 Tue May 18 03:33:39 1999 +++ php3/functions/oci8.c Fri May 21 05:01:47 1999 @@ -33,7 +33,7 @@ #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.98 1999/05/18 07:33:39 thies Exp $ */ +/* $Id: oci8.c,v 1.99 1999/05/21 09:01:47 thies Exp $ */ /* TODO list: * @@ -688,7 +688,7 @@ oci8_error(OCIError *err_p, char *what, sword status) { text errbuf[512]; - ub4 errcode = 0; + sb4 errcode = 0; switch (status) { case OCI_SUCCESS: @@ -995,7 +995,7 @@ "OCIParse", OCIStmtPrepare(statement->pStmt, connection->pError, - query, + (text*)query, len, OCI_NTV_SYNTAX, OCI_DEFAULT)); @@ -1201,7 +1201,7 @@ return 0; /* XXX we loose memory!!! */ } - outcol->name = estrndup(colname,outcol->name_len); + outcol->name = estrndup((char*) colname,outcol->name_len); /* Remember the size Oracle told us, we have to increase the * storage size for some types. @@ -2049,7 +2049,7 @@ OCI8_GLOBAL(php3_oci8_module).error = OCIServerAttach(server->pServer, OCI8_GLOBAL(php3_oci8_module).pError, - dbname, + (text*)dbname, strlen(dbname), (ub4) OCI_DEFAULT); @@ -2152,7 +2152,7 @@ */ static void oci8_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclusive) { - text *username, *password, *dbname; + char *username, *password, *dbname; pval *userParam, *passParam, *dbParam; oci8_server *server = 0; oci8_session *session = 0; @@ -2173,7 +2173,7 @@ username = userParam->value.str.val; password = passParam->value.str.val; - dbname = (text *)""; + dbname = ""; } else { WRONG_PARAM_COUNT; } @@ -2352,7 +2352,7 @@ RETURN_FALSE; } - define->name = estrndup(name->value.str.val,name->value.str.len); + define->name = (text*) estrndup(name->value.str.val,name->value.str.len); define->name_len = name->value.str.len; define->type = ocitype; define->pval = var; @@ -2470,7 +2470,7 @@ OCIBindByName(statement->pStmt, /* statement handle */ (OCIBind **)&bind->pBind, /* bind hdl (will alloc) */ statement->pError, /* error handle */ - name->value.str.val, /* placeholder name */ + (text*) name->value.str.val, /* placeholder name */ name->value.str.len, /* placeholder length */ (dvoid *)0, /* in/out data */ ocimaxlen, /* max size of input/output data */ @@ -3349,7 +3349,7 @@ oci8_statement *statement; oci8_connection *connection; text errbuf[512]; - ub4 errcode = 0; + sb4 errcode = 0; int type; sword error = 0; dvoid *errh = NULL; @@ -3388,7 +3388,7 @@ if (errcode) { array_init(return_value); add_assoc_long(return_value, "code", errcode); - add_assoc_string(return_value, "message", errbuf, 1); + add_assoc_string(return_value, "message", (char*) errbuf, 1); } else { RETURN_FALSE; } @@ -3532,7 +3532,7 @@ connection->error = OCIServerVersion(connection->pServiceContext, connection->pError, - version, + (text*)version, sizeof(version), OCI_HTYPE_SVCCTX); if (connection->error != OCI_SUCCESS) { @@ -3546,7 +3546,7 @@ /* {{{ proto int OCIStatementType(int stmt) Return the query type of an OCI statement. */ - + /* XXX it would be better with a general interface to OCIAttrGet() */ void php3_oci8_statementtype(INTERNAL_FUNCTION_PARAMETERS) -- 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