cvs: php4 /ext/oci8 oci8.c

sniper Wed Dec 11 10:25:40 2002 EDT Modified files: /php4/ext/oci8 oci8.c Log: - ws fixes - // -> /* */ (No C++ comments in c code!) - #if / #else / etc. have to start from first column. Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.195 php4/ext/oci8/oci8.c:1.196 --- php4/ext/oci8/oci8.c:1.195 Wed Dec 11 09:18:40 2002 +++ php4/ext/oci8/oci8.c Wed Dec 11 10:25:39 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.195 2002/12/11 14:18:40 abonamous Exp $ */ +/* $Id: oci8.c,v 1.196 2002/12/11 15:25:39 sniper Exp $ */ /* TODO list: * @@ -628,7 +628,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.195 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.196 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -2177,13 +2177,16 @@ session->server = server; session->exclusive = exclusive; - #ifdef HAVE_OCI9 - //following chunk is Oracle 9i+ ONLY +#ifdef HAVE_OCI9 + + /* following chunk is Oracle 9i+ ONLY */ if (*charset) { - //get ub2 charset id based on charset - //this is pretty secure, since if we don't have a valid character set name, - //0 comes back and we can still use the 0 in all further statements -> OCI uses NLS_LANG - //setting in that case + /* + get ub2 charset id based on charset + this is pretty secure, since if we don't have a valid character set name, + 0 comes back and we can still use the 0 in all further statements -> OCI uses NLS_LANG + setting in that case + */ CALL_OCI_RETURN(charsetid, OCINlsCharSetNameToId( OCI(pEnv), charset)); @@ -2192,7 +2195,7 @@ oci_debug("oci_do_connect: using charset id=%d",charsetid); } - //create an environment using the character set id, Oracle 9i+ ONLY + /* create an environment using the character set id, Oracle 9i+ ONLY */ CALL_OCI(OCIEnvNlsCreate( &session->pEnv, OCI_DEFAULT, @@ -2205,12 +2208,13 @@ charsetid, charsetid)); - #else - //fallback solution (simply use global env and charset, same behaviour as always been) +#else + + /* fallback solution (simply use global env and charset, same behaviour as always been) */ session->pEnv = OCI(pEnv); session->charsetId = 0; - #endif /*HAVE_OCI9*/ +#endif /* HAVE_OCI9 */ /* allocate temporary Service Context */ CALL_OCI_RETURN(OCI(error), OCIHandleAlloc( @@ -2597,8 +2601,8 @@ oci_session *session = 0; oci_connection *connection = 0; - //if a forth parameter is handed over, it is the charset identifier (but is only used in Oracle 9i+) - if (zend_get_parameters_ex(4, &userParam, &passParam, &dbParam, &charParam) == SUCCESS) { + /* if a forth parameter is handed over, it is the charset identifier (but is only used in Oracle 9i+) */ + if (zend_get_parameters_ex(4, &userParam, &passParam, &dbParam, &charParam) == SUCCESS) { convert_to_string_ex(userParam); convert_to_string_ex(passParam); convert_to_string_ex(dbParam);