Update of /cvsroot/mod-c/ehtml/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23027/src
Modified Files:
DiskSessionDriver.cpp Session.cpp
Log Message:
Second attempt to fix time_t printf tag. Under FreeBSD is defined as a long
int, and under Linux is defined as a int32_t.
Index: Session.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Session.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Session.cpp 12 Mar 2007 23:05:57 -0000 1.21
--- Session.cpp 13 Mar 2007 12:59:13 -0000 1.22
***************
*** 319,323 ****
ProfileMe();
char _e[11];
! snprintf(_e, 11, "%u", _expires);
operator[]("$$__EXPIRES$$") = _e;
string s(Dictionary::Serialize());
--- 319,323 ----
ProfileMe();
char _e[11];
! snprintf(_e, 11, "%ld", static_cast<long int>(_expires));
operator[]("$$__EXPIRES$$") = _e;
string s(Dictionary::Serialize());
***************
*** 329,333 ****
ProfileMe();
char _e[11];
! snprintf(_e, 11, "%u", s.Expires());
s["$$__EXPIRES$$"] = _e;
o << *static_cast<Dictionary*>(&s);
--- 329,333 ----
ProfileMe();
char _e[11];
! snprintf(_e, 11, "%ld", static_cast<long int>(s.Expires()));
s["$$__EXPIRES$$"] = _e;
o << *static_cast<Dictionary*>(&s);
Index: DiskSessionDriver.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/DiskSessionDriver.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DiskSessionDriver.cpp 12 Mar 2007 23:06:43 -0000 1.11
--- DiskSessionDriver.cpp 13 Mar 2007 12:59:13 -0000 1.12
***************
*** 196,202 ****
}
if (dev->Expired()) {
! Application()->Error("expired session (id=%s, expires=%u, "
! "now=%u)\n", id.hex().c_str(), dev->Expires(),
! time(NULL));
delete dev;
dev = NULL;
--- 196,203 ----
}
if (dev->Expired()) {
! Application()->Error("expired session (id=%s, expires=%ld, "
! "now=%ld)\n", id.hex().c_str(),
! static_cast<long int>(dev->Expires()),
! static_cast<long int>(time(NULL)));
delete dev;
dev = NULL;
|
