Author: byterock
Date: Mon Dec 22 04:51:07 2008
New Revision: 12278
Modified:
dbd-oracle/trunk/Changes
dbd-oracle/trunk/Oracle.pm
dbd-oracle/trunk/dbdimp.c
dbd-oracle/trunk/oci8.c
dbd-oracle/trunk/ocitrace.h
Log:
Fix for GCC 4.3 warnings from Eric Simon
Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes (original)
+++ dbd-oracle/trunk/Changes Mon Dec 22 04:51:07 2008
@@ -1,4 +1,5 @@
=head1 Changes in DBD-Oracle 1.23(svn rev #####)
+ Fix for GCC 4.3 warnings from Eric Simon
Standerdized the dbd_verbose levels so they are all 3 and over. from John Scoles
Added private statement functions ora_stmt_type_name and ora_stmt_type from John Scoles
Update to POD from Chris Underhill
Modified: dbd-oracle/trunk/Oracle.pm
==============================================================================
--- dbd-oracle/trunk/Oracle.pm (original)
+++ dbd-oracle/trunk/Oracle.pm Mon Dec 22 04:51:07 2008
@@ -2654,7 +2654,7 @@
3 = Both character sets are Unicode encodings.
-=head1 Private statment handle functions
+=head1 Private statement handle functions
=item ora_stmt_type
Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c (original)
+++ dbd-oracle/trunk/dbdimp.c Mon Dec 22 04:51:07 2008
@@ -988,6 +988,7 @@
if (cacheit) /* cache value for later DBI 'quick' fetch? */
hv_store((HV*)SvRV(dbh), key, kl, newSVsv(valuesv), 0);
+ (void)hv_store((HV*)SvRV(dbh), key, kl, newSVsv(valuesv), 0);
return TRUE;
}
@@ -1258,9 +1259,9 @@
imp_sth->all_params_hv = newHV();
phs_sv = newSVpv((char*)&phs_tpl, sizeof(phs_tpl)+namelen+1);
phs = (phs_t*)(void*)SvPVX(phs_sv);
- hv_store(imp_sth->all_params_hv, start, namelen, phs_sv, 0);
- phs->idx = idx-1; /* Will be 0 for :1, -1 for :foo. */
- strcpy(phs->name, start);
+ (void)hv_store(imp_sth->all_params_hv, start, namelen, phs_sv, 0);
+ phs->idx = idx-1; /* Will be 0 for :1, -1 for :foo. */
+ strcpy(phs->name, start);
}
*dest = '\0';
@@ -2212,7 +2213,7 @@
PerlIO_printf(DBILOGFP, "dbd_rebind_ph_char() (1): bind %s <== %.1000s (", phs->name, val);
if (!SvOK(phs->sv))
PerlIO_printf(DBILOGFP, "NULL, ");
- PerlIO_printf(DBILOGFP, "size %ld/%ld/%d, ",(long)SvCUR(phs->sv),(long)SvLEN(phs->sv),phs->maxlen);
+ PerlIO_printf(DBILOGFP, "size %ld/%ld/%ld, ",(long)SvCUR(phs->sv),(long)SvLEN(phs->sv),phs->maxlen);
PerlIO_printf(DBILOGFP, "ptype %d(%s), otype %d %s)\n",(int)SvTYPE(phs->sv), sql_typecode_name(phs->ftype),phs->ftype,(phs->is_inout) ? ", inout" : "");
}
@@ -2768,7 +2769,7 @@
if (!oratype_bind_ok(ora_type))
croak("Can't bind %s, ora_type %d not supported by DBD::Oracle", phs->name, ora_type);
if (sql_type)
- croak("Can't specify both TYPE (%d) and ora_type (%d) for %s", sql_type, ora_type, phs->name);
+ croak("Can't specify both TYPE (%ld) and ora_type (%d) for %s", sql_type, ora_type, phs->name);
phs->ftype = ora_type;
}
if ( (svp=hv_fetch((HV*)SvRV(attribs), "ora_field",9, 0)) != NULL) {
@@ -2777,7 +2778,7 @@
if ( (svp=hv_fetch((HV*)SvRV(attribs), "ora_csform", 10, 0)) != NULL) {
if (SvIV(*svp) == SQLCS_IMPLICIT || SvIV(*svp) == SQLCS_NCHAR)
phs->csform = (ub1)SvIV(*svp);
- else warn("ora_csform must be 1 (SQLCS_IMPLICIT) or 2 (SQLCS_NCHAR), not %d", SvIV(*svp));
+ else warn("ora_csform must be 1 (SQLCS_IMPLICIT) or 2 (SQLCS_NCHAR), not %ld", SvIV(*svp));
}
if ( (svp=hv_fetch((HV*)SvRV(attribs), "ora_maxdata_size", 16, 0)) != NULL) {
phs->maxdata_size = SvUV(*svp);
@@ -2810,8 +2811,8 @@
}
else if (sql_type && phs->ftype != ora_sql_type(imp_sth, phs->name, (int)sql_type)) {
- croak("Can't change TYPE of param %s to %d after initial bind",
- phs->name, sql_type);
+ croak("Can't change TYPE of param %s to %ld after initial bind",
+ phs->name, sql_type);
}
/* Array binding is supported for a limited number of data types. */
@@ -2824,8 +2825,7 @@
/* Supported */
}else{
/* All the other types are not supported */
- croak("Array bind is supported only for ORA_%_TABLE types. Unable to bind '%s'.",phs->name);
-
+ croak("Array bind is supported only for ORA_%%_TABLE types. Unable to bind '%s'.",phs->name);
}
}
}
@@ -3466,7 +3466,6 @@
AV *av = (AV*)SvRV(sv);
I32 avlen = AvFILL(av);
for (j=0;j<=avlen;j++){
- SV *sv2 = *av_fetch(av, j, 1);
dbd_phs_avsv_complete(phs, j, debug);
}
}
@@ -3810,8 +3809,8 @@
return FALSE;
if (cachesv) /* cache value for later DBI 'quick' fetch? */
- hv_store((HV*)SvRV(sth), key, kl, cachesv, 0);
- return TRUE;
+ (void)hv_store((HV*)SvRV(sth), key, kl, cachesv, 0);
+ return TRUE;
}
@@ -3857,9 +3856,9 @@
I32 keylen;
hv_iterinit(imp_sth->all_params_hv);
while ( (sv = hv_iternextsv(imp_sth->all_params_hv, &key, &keylen)) ) {
- phs_t *phs = (phs_t*)(void*)SvPVX(sv); /* placeholder struct */
- hv_store(pvhv, key, keylen, newSVsv(phs->sv), 0);
- }
+ phs_t *phs = (phs_t*)(void*)SvPVX(sv); /* placeholder struct */
+ (void)hv_store(pvhv, key, keylen, newSVsv(phs->sv), 0);
+ }
}
retsv = newRV_noinc((SV*)pvhv);
cacheit = FALSE;
Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Mon Dec 22 04:51:07 2008
@@ -3492,7 +3492,7 @@
if (CSFORM_IMPLIES_UTF8(SQLCS_IMPLICIT))
SvUTF8_on(sv);
(void)SvIOK_on(sv); /* "what a wonderful hack!" */
- hv_store(lob_cols_hv, col_name,col_name_len, sv,0);
+ (void)hv_store(lob_cols_hv, col_name,col_name_len, sv,0);
OCIDescriptorFree(colhd, OCI_DTYPE_PARAM);
colhd = NULL;
}
@@ -3567,7 +3567,7 @@
" lob refetch %s param: otype %d, matched field '%s' %s(%s)\n",
phs->name, phs->ftype, p,
(phs->ora_field) ? "by name " : "by type ", sql_field);
- hv_delete(lob_cols_hv, p, i, G_DISCARD);
+ (void)hv_delete(lob_cols_hv, p, i, G_DISCARD);
fbh = &lr->fbh_ary[lr->num_fields++];
fbh->name = phs->name;
fbh->ftype = phs->ftype;
@@ -3631,8 +3631,7 @@
phs_t *phs;
SV **phs_svp = hv_fetch(imp_sth->all_params_hv, fbh->name,strlen(fbh->name), 0);
if (!phs_svp)
- croak("panic: LOB refetch for '%s' param (%d) - name not found",
- fbh->name,i+1);
+ croak("panic: LOB refetch for '%s' param (%ld) - name not found",fbh->name,i+1);
phs = (phs_t*)(void*)SvPVX(*phs_svp);
fbh->special = phs;
if (DBIS->debug >= 3 || dbd_verbose >= 3 )
Modified: dbd-oracle/trunk/ocitrace.h
==============================================================================
--- dbd-oracle/trunk/ocitrace.h (original)
+++ dbd-oracle/trunk/ocitrace.h Mon Dec 22 04:51:07 2008
@@ -45,20 +45,21 @@
"%sCIServerVersion_log_stat(%p,%s)=%s\n",\
OciTp, sc,b,oci_status_name(stat)),stat \
: stat
+
#define OCIStmtGetPieceInfo_log_stat(stmhp,errhp,hdlptr,hdltyp,in_out,iter,idx,piece,stat)\
stat =OCIStmtGetPieceInfo(stmhp,errhp,hdlptr,hdltyp,in_out,iter,idx,piece);\
(DBD_OCI_TRACEON) \
? PerlIO_printf(DBD_OCI_TRACEFP,\
- "%sOCIStmtGetPieceInfo_log_stat(%p,%p,%d)=%s\n",\
- OciTp, (void*)errhp,fbh,piece,oci_status_name(stat)),stat \
- : stat
+ "%sOCIStmtGetPieceInfo_log_stat(%p,%p,%u)=%s\n",\
+ OciTp, (void*)errhp,fbh,(unsigned int)piece,oci_status_name(stat)),stat \
+ : stat
#define OCIStmtSetPieceInfo_log_stat(ptr,errhp,buf,blen,p,indp,rc,stat)\
stat =OCIStmtSetPieceInfo(ptr,OCI_HTYPE_DEFINE,errhp, buf, blen, p,indp,rc);\
(DBD_OCI_TRACEON) \
? PerlIO_printf(DBD_OCI_TRACEFP,\
- "%sOCIStmtSetPieceInfo_log_stat(%p,%p,%d,%d)=%s\n",\
+ "%sOCIStmtSetPieceInfo_log_stat(%p,%p,%d,%p)=%s\n",\
OciTp, (void*)errhp,fbh,piece,blen,oci_status_name(stat)),stat \
: stat
@@ -127,16 +128,16 @@
stat = OCIIntervalToText(envhp,errhp, *(OCIInterval**)di,3,3,sb,ln,sl);\
(DBD_OCI_TRACEON) \
? PerlIO_printf(DBD_OCI_TRACEFP,\
- "% OCIIntervalToText(%p,%p,%p,%s)=%s\n",\
- OciTp, (void*)errhp, di,sl,sb,oci_status_name(stat)),stat \
+ "%sOCIIntervalToText(%p,%p,%p,%s)=%s\n",\
+ OciTp, (void*)errhp, di,sl,sb,oci_status_name(stat)),stat \
: stat
#define OCIDateTimeToText_log_stat(envhp,errhp,d,sl,sb,stat)\
stat = OCIDateTimeToText(envhp,errhp, *(OCIDateTime**)d,(CONST text*) 0,(ub1) 0,0, (CONST text*) 0, (ub4) 0,(ub4 *)sl,sb );\
(DBD_OCI_TRACEON) \
? PerlIO_printf(DBD_OCI_TRACEFP,\
- "% OCIDateTimeToText(%p,%p,%p,%s)=%s\n",\
- OciTp, (void*)errhp, d,sl,sb,oci_status_name(stat)),stat \
+ "%sOCIDateTimeToText(%p,%p,%p,%s)=%s\n",\
+ OciTp, (void*)errhp, d,sl,sb,oci_status_name(stat)),stat \
: stat
@@ -178,7 +179,7 @@
stat = OCIDefineObject(defnp,errhp,tdo,eo_buff,0,eo_ind, 0);\
(DBD_OCI_TRACEON) \
? PerlIO_printf(DBD_OCI_TRACEFP,\
- "%sOCIDefineObject(%p,%p,%d)=%s\n",\
+ "%sOCIDefineObject(%p,%p,%p)=%s\n",\
OciTp, (void*)defnp, (void*)errhp, (void*)tdo,oci_status_name(stat)),stat \
: stat
@@ -300,7 +301,7 @@
"%sDescriptorAlloc(%p,%p,%s,0,0)\n", \
OciTp,(void*)envhp,(void*)(p1),oci_hdtype_name(t)); \
if (OCIDescriptorAlloc((envhp), (void**)(p1), (t), 0, 0)==OCI_SUCCESS); \
- else croak("OCIDescriptorAlloc (type %ld) failed",t)
+ else croak("OCIDescriptorAlloc (type %d) failed",t)
#define OCIDescriptorFree_log(d,t) \
if (DBD_OCI_TRACEON) PerlIO_printf(DBD_OCI_TRACEFP, \
@@ -455,7 +456,7 @@
stat=OCIServerAttach( imp_dbh->srvhp, imp_dbh->errhp, \
(text*)dbname, (sb4)strlen(dbname), md); \
(DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP, \
- "%sServerAttach(%p, %p, \"%s\", %d, mode=%s,%d)=%s\n", \
+ "%sServerAttach(%p, %p, \"%s\", %d, mode=%s,%lu)=%s\n", \
OciTp, (void*)imp_dbh->srvhp,(void*)imp_dbh->errhp, dbname, \
strlen(dbname), oci_mode(md),ul_t(md),oci_status_name(stat)),stat : stat
@@ -467,11 +468,11 @@
ul_t((ro)),(void*)(si),(void*)(so),oci_exe_mode(md),ul_t((md)), \
oci_status_name(stat)),stat : stat
-#define OCIStmtFetch_log_stat(sh,eh,nr,or,os,stat) \
- stat=OCIStmtFetch2(sh,eh,nr,or,os,OCI_DEFAULT); \
- (DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP, \
- "%sStmtFetch(%p,%p,%lu,%u,%lu)=%s\n", \
- OciTp, (void*)sh,(void*)eh,ul_t(nr),(ub2)or,(ub2)os, \
+#define OCIStmtFetch_log_stat(sh,eh,nr,or,os,stat) \
+ stat=OCIStmtFetch2(sh,eh,nr,or,os,OCI_DEFAULT); \
+ (DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP, \
+ "%sStmtFetch(%p,%p,%lu,%u,%d)=%s\n", \
+ OciTp, (void*)sh,(void*)eh,ul_t(nr),(ub2)or,(ub2)os, \
oci_status_name(stat)),stat : stat
#define OCIStmtPrepare_log_stat(sh,eh,s1,sl,l,m,stat) \
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.