github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-04 17:15:23 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Minor fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1818 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-12-17 08:47:26 +00:00
parent f9c9e138ad
commit 539410821e
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/XML.cpp
View file

@ -510,7 +510,7 @@ bool XmlParser::IsText()
String XmlParser::ReadText()
{
if(!IsText())
throw XmlError("Character data expected");
return String();
String h = text;
Next();
return h;

3
uppsrc/Sql/SqlSchema.cpp
View file

@ -192,9 +192,10 @@ void SqlSchema::SaveNormal(const char *dir, const char *name) const {
SqlSchema::SqlSchema(int dialect_)
{
dialect = dialect_;
maxidlen = 63;
if(dialect == MSSQL)
maxidlen = 128;
else
if(dialect == ORACLE)
maxidlen = 24;
}

2
uppsrc/Web/httpsrv.cpp
View file

@ -2,7 +2,7 @@
NAMESPACE_UPP
#define LLOG(x) // RLOG(x)
#define LLOG(x) // RLOG(x)
#define SLOWWRITE 4 // KB/s, comment out to turn off

6
uppsrc/Web/socket.cpp
View file

@ -29,8 +29,8 @@ static bool LogSocketFlag = false;
void LogSockets(bool ls) { LogSocketFlag = ls; }
bool IsLogSockets() { return LogSocketFlag; }
#define SLOG(x) if(!LogSocketFlag) ; else RLOG("[" << GetSysTime() << " @ " << int(GetTickCount() % 10000u) << "] " << x)
#define LLOG(x)
#define SLOG(x) if(!LogSocketFlag) ; else RLOG("[" << GetSysTime() << " @ " << int(GetTickCount() % 10000u) << "] " << x)
#define LLOG(x) // LOG(x)
#ifdef PLATFORM_POSIX
@ -615,7 +615,7 @@ String Socket::Read(int timeout, int maxlen)
return Null;
char buffer[SOCKBUFSIZE];
int count = data->Read(buffer, min<int>(maxlen, sizeof(buffer)));
SLOG("recv(" << GetNumber() << ") -> " << count);
SLOG("recv(" << GetNumber() << ") -> " << count << ": " << String(buffer, max(count, 64)));
if(data->IsError())
return String::GetVoid();
if(count <= 0) {