Author: turnstep
Date: Tue Sep 15 07:31:01 2009
New Revision: 13342
Modified:
DBD-Pg/trunk/Pg.xs
DBD-Pg/trunk/dbdimp.c
Log:
Minor changes suggested by pport
Modified: DBD-Pg/trunk/Pg.xs
==============================================================================
--- DBD-Pg/trunk/Pg.xs (original)
+++ DBD-Pg/trunk/Pg.xs Tue Sep 15 07:31:01 2009
@@ -270,7 +270,7 @@
SV *dbh
CODE:
D_imp_dbh(dbh);
- ST(0) = strEQ(imp_dbh->sqlstate,"00000") ? &sv_no :
newSVpv(imp_dbh->sqlstate, 5);
+ ST(0) = strEQ(imp_dbh->sqlstate,"00000") ? &PL_sv_no :
newSVpv(imp_dbh->sqlstate, 5);
void do(dbh, statement, attr=Nullsv, ...)
@@ -341,7 +341,7 @@
pg_endcopy(dbh)
SV * dbh
CODE:
- ST(0) = (pg_db_endcopy(dbh)!=0) ? &sv_no : &sv_yes;
+ ST(0) = (pg_db_endcopy(dbh)!=0) ? &PL_sv_no : &PL_sv_yes;
void
@@ -360,7 +360,7 @@
D_imp_dbh(dbh);
if (DBIc_has(imp_dbh,DBIcf_AutoCommit) && DBIc_WARN(imp_dbh))
warn("savepoint ineffective with AutoCommit enabled");
- ST(0) = (pg_db_savepoint(dbh, imp_dbh, name)!=0) ? &sv_yes :
&sv_no;
+ ST(0) = (pg_db_savepoint(dbh, imp_dbh, name)!=0) ? &PL_sv_yes :
&PL_sv_no;
void
@@ -371,7 +371,7 @@
D_imp_dbh(dbh);
if (DBIc_has(imp_dbh,DBIcf_AutoCommit) && DBIc_WARN(imp_dbh))
warn("rollback_to ineffective with AutoCommit enabled");
- ST(0) = (pg_db_rollback_to(dbh, imp_dbh, name)!=0) ? &sv_yes :
&sv_no;
+ ST(0) = (pg_db_rollback_to(dbh, imp_dbh, name)!=0) ? &PL_sv_yes
: &PL_sv_no;
void
@@ -382,7 +382,7 @@
D_imp_dbh(dbh);
if (DBIc_has(imp_dbh,DBIcf_AutoCommit) && DBIc_WARN(imp_dbh))
warn("release ineffective with AutoCommit enabled");
- ST(0) = (pg_db_release(dbh, imp_dbh, name)!=0) ? &sv_yes :
&sv_no;
+ ST(0) = (pg_db_release(dbh, imp_dbh, name)!=0) ? &PL_sv_yes :
&PL_sv_no;
void
pg_lo_creat(dbh, mode)
@@ -390,7 +390,7 @@
int mode
CODE:
const unsigned int ret = pg_db_lo_creat(dbh, mode);
- ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &sv_undef;
+ ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &PL_sv_undef;
void
pg_lo_open(dbh, lobjId, mode)
@@ -399,7 +399,7 @@
int mode
CODE:
const int ret = pg_db_lo_open(dbh, lobjId, mode);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -410,7 +410,7 @@
size_t len
CODE:
const int ret = pg_db_lo_write(dbh, fd, buf, len);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -432,7 +432,7 @@
sv_setpvn(ST(2), buf, (unsigned)ret);
SvSETMAGIC(ST(2));
}
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -443,7 +443,7 @@
int whence
CODE:
const int ret = pg_db_lo_lseek(dbh, fd, offset, whence);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -452,7 +452,7 @@
int fd
CODE:
const int ret = pg_db_lo_tell(dbh, fd);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -460,7 +460,7 @@
SV * dbh
int fd
CODE:
- ST(0) = (pg_db_lo_close(dbh, fd) >= 0) ? &sv_yes : &sv_no;
+ ST(0) = (pg_db_lo_close(dbh, fd) >= 0) ? &PL_sv_yes : &PL_sv_no;
void
@@ -468,7 +468,7 @@
SV * dbh
unsigned int lobjId
CODE:
- ST(0) = (pg_db_lo_unlink(dbh, lobjId) >= 1) ? &sv_yes : &sv_no;
+ ST(0) = (pg_db_lo_unlink(dbh, lobjId) >= 1) ? &PL_sv_yes :
&PL_sv_no;
void
@@ -477,7 +477,7 @@
char * filename
CODE:
const unsigned int ret = pg_db_lo_import(dbh, filename);
- ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &sv_undef;
+ ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &PL_sv_undef;
void
@@ -486,7 +486,7 @@
unsigned int lobjId
char * filename
CODE:
- ST(0) = (pg_db_lo_export(dbh, lobjId, filename) >= 1) ? &sv_yes
: &sv_no;
+ ST(0) = (pg_db_lo_export(dbh, lobjId, filename) >= 1) ?
&PL_sv_yes : &PL_sv_no;
void
@@ -495,7 +495,7 @@
int mode
CODE:
const unsigned int ret = pg_db_lo_creat(dbh, mode);
- ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &sv_undef;
+ ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &PL_sv_undef;
void
lo_open(dbh, lobjId, mode)
@@ -504,7 +504,7 @@
int mode
CODE:
const int ret = pg_db_lo_open(dbh, lobjId, mode);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -515,7 +515,7 @@
size_t len
CODE:
const int ret = pg_db_lo_write(dbh, fd, buf, len);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -537,7 +537,7 @@
sv_setpvn(ST(2), buf, (unsigned)ret);
SvSETMAGIC(ST(2));
}
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -548,7 +548,7 @@
int whence
CODE:
const int ret = pg_db_lo_lseek(dbh, fd, offset, whence);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -557,7 +557,7 @@
int fd
CODE:
const int ret = pg_db_lo_tell(dbh, fd);
- ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &sv_undef;
+ ST(0) = (ret >= 0) ? sv_2mortal(newSViv(ret)) : &PL_sv_undef;
void
@@ -565,7 +565,7 @@
SV * dbh
int fd
CODE:
- ST(0) = (pg_db_lo_close(dbh, fd) >= 0) ? &sv_yes : &sv_no;
+ ST(0) = (pg_db_lo_close(dbh, fd) >= 0) ? &PL_sv_yes : &PL_sv_no;
void
@@ -573,7 +573,7 @@
SV * dbh
unsigned int lobjId
CODE:
- ST(0) = (pg_db_lo_unlink(dbh, lobjId) >= 1) ? &sv_yes : &sv_no;
+ ST(0) = (pg_db_lo_unlink(dbh, lobjId) >= 1) ? &PL_sv_yes :
&PL_sv_no;
void
@@ -582,7 +582,7 @@
char * filename
CODE:
const unsigned int ret = pg_db_lo_import(dbh, filename);
- ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &sv_undef;
+ ST(0) = (ret > 0) ? sv_2mortal(newSVuv(ret)) : &PL_sv_undef;
void
@@ -591,7 +591,7 @@
unsigned int lobjId
char * filename
CODE:
- ST(0) = (pg_db_lo_export(dbh, lobjId, filename) >= 1) ? &sv_yes
: &sv_no;
+ ST(0) = (pg_db_lo_export(dbh, lobjId, filename) >= 1) ?
&PL_sv_yes : &PL_sv_no;
void
@@ -599,7 +599,7 @@
SV * dbh
char * buf
CODE:
- ST(0) = (pg_db_putline(dbh, buf)!=0) ? &sv_no : &sv_yes;
+ ST(0) = (pg_db_putline(dbh, buf)!=0) ? &PL_sv_no : &PL_sv_yes;
void
@@ -607,7 +607,7 @@
SV * dbh
char * buf
CODE:
- ST(0) = (pg_db_putline(dbh, buf)!=0) ? &sv_no : &sv_yes;
+ ST(0) = (pg_db_putline(dbh, buf)!=0) ? &PL_sv_no : &PL_sv_yes;
void
@@ -628,7 +628,7 @@
ret = pg_db_getline(dbh, bufsv, (int)len);
sv_setpv((SV*)ST(1), buf);
SvSETMAGIC(ST(1));
- ST(0) = (-1 != ret) ? &sv_yes : &sv_no;
+ ST(0) = (-1 != ret) ? &PL_sv_yes : &PL_sv_no;
I32
pg_getcopydata(dbh, dataline)
@@ -684,13 +684,13 @@
ret = pg_db_getline(dbh, bufsv, (int)len);
sv_setpv((SV*)ST(1), buf);
SvSETMAGIC(ST(1));
- ST(0) = (-1 != ret) ? &sv_yes : &sv_no;
+ ST(0) = (-1 != ret) ? &PL_sv_yes : &PL_sv_no;
void
endcopy(dbh)
SV * dbh
CODE:
- ST(0) = (-1 != pg_db_endcopy(dbh)) ? &sv_yes : &sv_no;
+ ST(0) = (-1 != pg_db_endcopy(dbh)) ? &PL_sv_yes : &PL_sv_no;
void
pg_server_trace(dbh,fh)
@@ -750,7 +750,7 @@
SV *dbh
CODE:
D_imp_dbh(dbh);
- ST(0) = pg_db_cancel(dbh, imp_dbh) ? &sv_yes : &sv_no;
+ ST(0) = pg_db_cancel(dbh, imp_dbh) ? &PL_sv_yes : &PL_sv_no;
#endif
@@ -768,7 +768,7 @@
CODE:
D_imp_sth(sth);
D_imp_dbh_from_sth;
- ST(0) = strEQ(imp_dbh->sqlstate,"00000") ? &sv_no :
newSVpv(imp_dbh->sqlstate, 5);
+ ST(0) = strEQ(imp_dbh->sqlstate,"00000") ? &PL_sv_no :
newSVpv(imp_dbh->sqlstate, 5);
void
pg_ready(sth)
@@ -783,7 +783,7 @@
SV *sth
CODE:
D_imp_sth(sth);
- ST(0) = pg_db_cancel_sth(sth, imp_sth) ? &sv_yes : &sv_no;
+ ST(0) = pg_db_cancel_sth(sth, imp_sth) ? &PL_sv_yes : &PL_sv_no;
#if PGLIBVERSION >= 80000
Modified: DBD-Pg/trunk/dbdimp.c
==============================================================================
--- DBD-Pg/trunk/dbdimp.c (original)
+++ DBD-Pg/trunk/dbdimp.c Tue Sep 15 07:31:01 2009
@@ -1080,7 +1080,7 @@
(void)av_store(av, fields, newSViv(o %
(o>>16)));
}
else {
- (void)av_store(av, fields, &sv_undef);
+ (void)av_store(av, fields,
&PL_sv_undef);
}
}
}
@@ -1185,7 +1185,7 @@
sz = PQfsize(imp_sth->result, fields);
break;
}
- (void)av_store(av, fields, sz > 0 ? newSViv(sz)
: &sv_undef);
+ (void)av_store(av, fields, sz > 0 ? newSViv(sz)
: &PL_sv_undef);
}
}
break;
@@ -1193,13 +1193,13 @@
case 10: /* CursorName */
if (strEQ("CursorName", key))
- retsv = &sv_undef;
+ retsv = &PL_sv_undef;
break;
case 11: /* RowsInCache */
if (strEQ("RowsInCache", key))
- retsv = &sv_undef;
+ retsv = &PL_sv_undef;
break;
case 13: /* pg_oid_status pg_cmd_status */
@@ -1298,7 +1298,7 @@
if (TSTART) TRC(DBILOGFP, "%sBegin dbd_discon_all\n", THEADER);
/* The disconnect_all concept is flawed and needs more work */
- if (!PL_dirty && !SvTRUE(perl_get_sv("DBI::PERL_ENDING",0))) {
+ if (!PL_dirty && !SvTRUE(get_sv("DBI::PERL_ENDING",0))) {
sv_setiv(DBIc_ERR(imp_drh), (IV)1);
sv_setpv(DBIc_ERRSTR(imp_drh), "disconnect_all not
implemented");
}
@@ -1340,7 +1340,7 @@
TRACE_PQERRORMESSAGE;
pg_error(aTHX_ dbh, PGRES_FATAL_ERROR,
PQerrorMessage(imp_dbh->conn));
if (TEND) TRC(DBILOGFP, "%sEnd pg_db_pg_notifies (error)\n",
THEADER);
- return &sv_undef;
+ return &PL_sv_undef;
}
TRACE_PQNOTIFIES;
@@ -1348,7 +1348,7 @@
if (!notify) {
if (TEND) TRC(DBILOGFP, "%sEnd pg_db_pg_notifies (undef)\n",
THEADER);
- return &sv_undef;
+ return &PL_sv_undef;
}
ret=newAV();
@@ -2335,7 +2335,7 @@
/* convert to a string ASAP */
if (!SvPOK(newvalue) && SvOK(newvalue)) {
- (void)sv_2pv(newvalue, &na);
+ (void)sv_2pv(newvalue, &PL_na);
}
/* upgrade to at least string */
