Permalink
Browse files

SvUPGRADE is no longer an expression.

git-svn-id: http://svn.perl.org/modules/dbd-oracle/trunk@15519 50811bd7-b8ce-0310-adc1-d9db26280581
  • Loading branch information...
1 parent e64a8f0 commit 42e08a4caf28ba032893b11ffc62eee88284aee6 mjevans committed Dec 17, 2012
Showing with 11 additions and 6 deletions.
  1. +5 −0 Changes
  2. +3 −3 dbdimp.c
  3. +3 −3 oci8.c
View
@@ -62,6 +62,11 @@ NEXT_VERSION
- 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
View
@@ -1707,7 +1707,7 @@ dbd_rebind_ph_varchar2_table(SV *sth, imp_sth_t *imp_sth, phs_t *phs)
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 @@ dbd_rebind_ph_char(imp_sth_t *imp_sth, phs_t *phs)
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 @@ ora_st_execute_array(sth, imp_sth, tuples, tuples_status, columns, exe_count, er
/*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);
View
@@ -1644,7 +1644,7 @@ dbd_rebind_ph_lob(SV *sth, imp_sth_t *imp_sth, phs_t *phs)
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 @@ dbd_rebind_ph_lob(SV *sth, imp_sth_t *imp_sth, phs_t *phs)
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 @@ post_execute_lobs(SV *sth, imp_sth_t *imp_sth, ub4 row_count) /* XXX leaks handl
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 */

0 comments on commit 42e08a4

Please sign in to comment.