- ws fixes

- // -> /* */ (No C++ comments in c code!)
- #if / #else / etc. have to start from first column.

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 7f76fa0ae1a59c19fd77d5efdecf674c2b70a920..4691aa98db5b23047031ba967bc1e7e4bba91f9f 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2177,13 +2177,16 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
        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 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
                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 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
                                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 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu
        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);