2008-07-30
2008-07-30 10:48:16 by Stephen R. van den Berg <srb@cuci.nl>
-
17b7531de776a6bfd8c6c72b6101415ea4298aa0
(18 lines)
(+8/-10)
[
Show
| Annotate
]
Branch: 7.9
pgsql cleaned up _sprintf verbosity, amended CHANGES, use String.secure
Rev: CHANGES:1.123
Rev: lib/modules/Sql.pmod/pgsql.pike:1.16
Rev: lib/modules/Sql.pmod/pgsql_util.pmod:1.3
Rev: lib/modules/Sql.pmod/pgsqls.pike:1.4
180: Inside #if constant(SSL.sslfile)
Stdio.File rawstream;
inline int(-1..1) peek(int timeout) {
- return rawstream.peek(timeout);
- }
+ return rawstream.peek(timeout); // This is a kludge
+ } // Actually SSL.sslfile should provide a peek() method
inline string read(int len,void|int(0..1) not_all) {
return std::read(len,not_all);
237:
switch(type) {
case 'O':
res=sprintf("pgsql_result numrows: %d eof: %d querylock: %d"
- " inflight: %d portalname: %O\n"
+ " inflight: %d\nportalname: %O datarows: %d\n"
"query: %O\n"
- "laststatus: %s\n"
- "%O\n"
- "%O\n",
- numrows,eoffound,!!_qmtxkey,_inflight,_portalname,
+ "laststatus: %s\n",
+ numrows,eoffound,!!_qmtxkey,_inflight,
+ _portalname,sizeof(_datarowdesc),
query,
- _statuscmdcomplete||"",
- _datarowdesc,
- _pgsqlsess);
+ _statuscmdcomplete||"");
break;
}
return res;