[svn:dbd-oracle] r14512 - dbd-oracle/branches/polute

Author: byterock
Date: Mon Nov  1 04:37:36 2010
New Revision: 14512

Modified:
   dbd-oracle/branches/polute/dbdimp.c
   dbd-oracle/branches/polute/oci8.c

Log:
Next round of PL_ fixes.

Did not find any more than above so I can cut a release candidate from this me thinks

Modified: dbd-oracle/branches/polute/dbdimp.c
==============================================================================
--- dbd-oracle/branches/polute/dbdimp.c	(original)
+++ dbd-oracle/branches/polute/dbdimp.c	Mon Nov  1 04:37:36 2010
@@ -212,7 +212,7 @@
 	dTHR;
 	dTHX;
 	/* The disconnect_all concept is flawed and needs more work */
-	if (!dirty && !SvTRUE(perl_get_sv("DBI::PERL_ENDING",0))) {
+	if (!PL_dirty && !SvTRUE(perl_get_sv("DBI::PERL_ENDING",0))) {
 	DBIh_SET_ERR_CHAR(drh, (imp_xxh_t*)imp_drh, Nullch, 1, "disconnect_all not implemented", Nullch, Nullch);
 	return FALSE;
 	}
@@ -3846,7 +3846,7 @@
 		if (fbh->fetch_cleanup) fbh->fetch_cleanup(sth, fbh);
 	}
 
-	if (dirty)			/* don't walk on the wild side	*/
+	if (PL_dirty)			/* don't walk on the wild side	*/
 		return 1;
 
 	if (!DBIc_ACTIVE(imp_dbh))		/* no longer connected	*/
@@ -3963,10 +3963,10 @@
 
 	if (DBIc_DBISTATE(imp_sth)->debug >= 6 || dbd_verbose >= 6 )
 		PerlIO_printf(DBIc_LOGPIO(imp_sth), "	dbd_st_destroy %s\n",
-		(dirty) ? "(OCIHandleFree skipped during global destruction)" :
+		(PL_dirty) ? "(OCIHandleFree skipped during global destruction)" :
 		(imp_sth->nested_cursor) ?"(OCIHandleFree skipped for nested cursor)" : "");
 
-	if (!dirty) { /* XXX not ideal, leak may be a problem in some cases */
+	if (!PL_dirty) { /* XXX not ideal, leak may be a problem in some cases */
 		if (!imp_sth->nested_cursor) {
 			OCIHandleFree_log_stat(imp_sth->stmhp, OCI_HTYPE_STMT, status);
 			if (status != OCI_SUCCESS)
@@ -4059,7 +4059,7 @@
 	/* we can't return Nullsv here because the xs code will	*/
 	/* then just pass the attribute name to DBI for FETCH.	*/
 		croak("Describe failed during %s->FETCH(%s): %ld: %s",
-			SvPV(sth,na), key, (long)SvIV(DBIc_ERR(imp_sth)),
+			SvPV(sth,PL_na), key, (long)SvIV(DBIc_ERR(imp_sth)),
 			SvPV(DBIc_ERRSTR(imp_sth),lna)
 		);
 	}

Modified: dbd-oracle/branches/polute/oci8.c
==============================================================================
--- dbd-oracle/branches/polute/oci8.c	(original)
+++ dbd-oracle/branches/polute/oci8.c	Mon Nov  1 04:37:36 2010
@@ -347,7 +347,7 @@
 #endif
 	}
 	sv = sv_2mortal(newSViv((IV)hdtype));
-	return SvPV(sv,na);
+	return SvPV(sv,PL_na);
 }
 
 /*used to look up the name of a csform value
@@ -368,7 +368,7 @@
 	}
 
 	sv = sv_2mortal(newSViv((IV)attr));
-	return SvPV(sv,na);
+	return SvPV(sv,PL_na);
 }
 
 /*used to look up the name of a OCI_DTYPE_PARAM Attribute Types
@@ -399,7 +399,7 @@
 	}
 
 	sv = sv_2mortal(newSViv((IV)attr));
-	return SvPV(sv,na);
+	return SvPV(sv,PL_na);
 
 }
 
@@ -691,7 +691,7 @@
 
 	}
 	sv = sv_2mortal(newSViv((IV)attr));
-	return SvPV(sv,na);
+	return SvPV(sv,PL_na);
 }
 
 /*used to look up the name of a fetchtype constant
@@ -712,7 +712,7 @@
 		case OCI_FETCH_RELATIVE:	return "OCI_FETCH_RELATIVE";
 	}
 	sv = sv_2mortal(newSViv((IV)fetchtype));
-	return SvPV(sv,na);
+	return SvPV(sv,PL_na);
 }
 
 
@@ -827,7 +827,7 @@
 	sv_insert(sqlsv, parse_error_offset, 0, "<*>", 3);
 	sv_catsv(msgsv, sqlsv);
 	sv_catpv(msgsv, "'");
-	return SvPV(msgsv,na);
+	return SvPV(msgsv,PL_na);
 #else
 	imp_sth = imp_sth; /* not unused */
 	return msg;
@@ -2892,7 +2892,7 @@
 	obj->full_type_name = newSVpv((char*)schema_name, schema_namel);
 	sv_catpvn(obj->full_type_name, ".", 1);
 	sv_catpvn(obj->full_type_name, (char*)type_name, type_namel);
-	obj->type_name = (text*)SvPV(obj->full_type_name,na);
+	obj->type_name = (text*)SvPV(obj->full_type_name,PL_na);
 
 	/*we need to know its type code*/
 
@@ -3457,7 +3457,7 @@
 				p = "Field %d has an Oracle type (%d) which is not explicitly supported%s";
 				if (DBIS->debug >= 1 || dbd_verbose >= 3 )
 					PerlIO_printf(DBILOGFP, p, i, fbh->dbtype, "\n");
-				if (dowarn)
+				if (PL_dowarn)
 					warn(p, i, fbh->dbtype, "");
 				break;
 		}
@@ -4212,9 +4212,9 @@
 		while( (sv = hv_iternextsv(lob_cols_hv, &p, &j)) != NULL ) {
 			char sql_field[200];
 			if (phs->ora_field) {	/* must match this phs by field name	*/
-				char *ora_field_name = SvPV(phs->ora_field,na);
+				char *ora_field_name = SvPV(phs->ora_field,PL_na);
 				if (SvCUR(phs->ora_field) != SvCUR(sv)
-					|| ibcmp(ora_field_name, SvPV(sv,na), (I32)SvCUR(sv) ) )
+					|| ibcmp(ora_field_name, SvPV(sv,PL_na), (I32)SvCUR(sv) ) )
 					continue;
 			}
 			else {			/* basic dumb match by type		*/