CVS update: php3/functions
| From: | ssb | Date: | Thu, 26 Nov 1998 10:53:08 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2596@lists.php.net to get a copy of this message | ||
Date: Thursday November 26, 1998 @ 5:53
Author: ssb
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv16708
Modified Files:
oracle.c
Log Message:
make Ora_Error() and Ora_ErrorCode() accept both connections and cursors
Index: php3/functions/oracle.c
diff -c php3/functions/oracle.c:1.84 php3/functions/oracle.c:1.85
*** php3/functions/oracle.c:1.84 Sat Oct 17 17:14:22 1998
--- php3/functions/oracle.c Thu Nov 26 05:53:08 1998
***************
*** 1333,1373 ****
void php3_Ora_Error(INTERNAL_FUNCTION_PARAMETERS)
{
! pval *cursor_index;
oraCursor *cursor;
! if (ARG_COUNT(ht) != 1 || getParametersArray(ht, 1, &cursor_index) ==
! FAILURE) {
WRONG_PARAM_COUNT;
}
! convert_to_long(cursor_index);
! if ((cursor = ora_get_cursor(list, cursor_index->value.lval)) == NULL){
! RETURN_FALSE;
}
-
- return_value->type = IS_STRING;
- return_value->value.str.val = ora_error(&cursor->cda);
- return_value->value.str.len = strlen(return_value->value.str.val);
}
void php3_Ora_ErrorCode(INTERNAL_FUNCTION_PARAMETERS)
{
! pval *cursor_index;
oraCursor *cursor;
! if (ARG_COUNT(ht) != 1 || getParametersArray(ht, 1, &cursor_index) ==
! FAILURE) {
WRONG_PARAM_COUNT;
}
! convert_to_long(cursor_index);
! if (!(cursor = ora_get_cursor(list, cursor_index->value.lval))){
! RETURN_FALSE;
}
-
- RETURN_LONG(cursor->cda.rc);
}
--- 1333,1375 ----
void php3_Ora_Error(INTERNAL_FUNCTION_PARAMETERS)
{
! pval *arg;
oraCursor *cursor;
+ oraConnection *conn;
! if (ARG_COUNT(ht) != 1 || getParametersArray(ht, 1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
}
! convert_to_long(arg);
! if ((cursor = ora_get_cursor(list, arg->value.lval)) != NULL) {
! return_value->type = IS_STRING;
! return_value->value.str.val = ora_error(&cursor->cda);
! return_value->value.str.len = strlen(return_value->value.str.val);
! } else if ((conn = ora_get_conn(list, arg->value.lval)) != NULL) {
! return_value->type = IS_STRING;
! return_value->value.str.val = ora_error(&conn->lda);
! return_value->value.str.len = strlen(return_value->value.str.val);
}
}
void php3_Ora_ErrorCode(INTERNAL_FUNCTION_PARAMETERS)
{
! pval *arg;
oraCursor *cursor;
+ oraConnection *conn;
! if (ARG_COUNT(ht) != 1 || getParametersArray(ht, 1, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
}
! convert_to_long(arg);
! if ((cursor = ora_get_cursor(list, arg->value.lval)) != NULL) {
! RETVAL_LONG(cursor->cda.rc);
! } else if ((conn = ora_get_conn(list, arg->value.lval)) != NULL) {
! RETURN_LONG(conn->lda.rc);
}
}
--
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