[svn:dbd-oracle] r15519 - dbd-oracle/trunk

Author: mjevans
Date: Mon Dec 17 06:29:10 2012
New Revision: 15519

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/dbdimp.c
   dbd-oracle/trunk/oci8.c

Log:
SvUPGRADE is no longer an expression.


Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Mon Dec 17 06:29:10 2012
@@ -62,6 +62,11 @@
 
   - Removed ineffective commit in 34pres_lobs.t (Martin J. Evans)
 
+  - Changed any use of if SvUPGRADE to remove the if test as per email
+    from Dave Mitchell and posting at
+    http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2012-12/msg00424.html
+    (Martin J. Evans)
+
 1.52      2012-10-19
 
  - promote 1.51_00 to official release

Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c	(original)
+++ dbd-oracle/trunk/dbdimp.c	Mon Dec 17 06:29:10 2012
@@ -1707,7 +1707,7 @@
 						sv_2pv(item, &length);
 					}
 				} else { /* ensure we're at least an SVt_PV (so SvPVX etc work)	 */
-					if(SvUPGRADE(item, SVt_PV)){}
+					(void)SvUPGRADE(item, SVt_PV);
 				}
 			}
 			if( length == 0 ){
@@ -2513,7 +2513,7 @@
 				sv_2pv(phs->sv, &PL_na);
 		}
 		else /* ensure we're at least an SVt_PV (so SvPVX etc work)	*/
-			if(SvUPGRADE(phs->sv, SVt_PV)){} /* For gcc not to warn on unused result)*/;
+			(void) SvUPGRADE(phs->sv, SVt_PV);
 	}
 
 
@@ -3800,7 +3800,7 @@
 
 			/*check to see if value sv is a null (undef) if it is upgrade it*/
  			if (!SvOK(sv))	{
-				if(SvUPGRADE(sv, SVt_PV)){} /* For GCC not to warn on unused result */
+				(void)SvUPGRADE(sv, SVt_PV);
 			}
 			else {
 				SvPV(sv, len);

Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c	(original)
+++ dbd-oracle/trunk/oci8.c	Mon Dec 17 06:29:10 2012
@@ -1644,7 +1644,7 @@
 				sv_2pv(phs->sv, &PL_na);
 		}
 		else { /* ensure we're at least an SVt_PV (so SvPVX etc work)	 */
-			if(SvUPGRADE(phs->sv, SVt_PV)){} /* For GCC not to warn on unused result */
+			(void)SvUPGRADE(phs->sv, SVt_PV);
 		}
 	}
 
@@ -1675,7 +1675,7 @@
 		imp_sth->stmt_type == OCI_STMT_DECLARE) {
 		ub4 amtp;
 
-		if(SvUPGRADE(phs->sv, SVt_PV)){/* For GCC not to warn on unused result */};	/* just in case */
+		(void)SvUPGRADE(phs->sv, SVt_PV);
 
 		amtp = SvCUR(phs->sv);		/* XXX UTF8? */
 
@@ -4812,7 +4812,7 @@
 		phs_t *phs = (phs_t*)fbh->special;
 		ub4 amtp;
 
-		if(SvUPGRADE(phs->sv, SVt_PV)){/* For GCC not to warn on unused result */ };	/* just in case */
+		(void)SvUPGRADE(phs->sv, SVt_PV);
 
 		amtp = SvCUR(phs->sv);		/* XXX UTF8? */
 		if (rc == 1405) {		/* NULL - return undef */