root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.1 nopatch

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Corretto ordinamento campi


git-svn-id: svn://10.65.10.50/trunk@12176 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2004-06-10 15:53:08 +00:00
parent 3ed16ccb4e
commit 85f78075db
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/report.cpp
View File

@ -1566,12 +1566,12 @@ int TReport_field::compare(const TSortable& s) const
{ {
const TReport_field& rf = (TReport_field&)s; const TReport_field& rf = (TReport_field&)s;
int cmp = _rct.y - rf._rct.y; int cmp = _id - rf._id;
if (cmp == 0) if (cmp == 0)
{ {
cmp = _rct.x - rf._rct.x; cmp = _rct.y - rf._rct.y;
if (cmp == 0) if (cmp == 0)
cmp = _id - rf._id; cmp = _rct.x - rf._rct.x;
} }
return cmp; return cmp;
} }

10
include/strings.cpp
View File

@ -26,7 +26,6 @@
TString& user() TString& user()
{ {
static TString8 _user; static TString8 _user;
return _user; return _user;
} }
@ -857,7 +856,12 @@ TString& TString::format(
char spark[512]; char spark[512];
va_list pars; va_list pars;
va_start(pars, fmt); va_start(pars, fmt);
#ifdef WIN32
const unsigned int tot = _vsnprintf(spark, sizeof(spark), fmt, pars);
#else
const unsigned int tot = vsprintf(spark, fmt, pars); const unsigned int tot = vsprintf(spark, fmt, pars);
#endif
va_end(pars); va_end(pars);
CHECK(tot < sizeof(spark), "Ue'! Quanto scrivi?"); CHECK(tot < sizeof(spark), "Ue'! Quanto scrivi?");
@ -1040,7 +1044,11 @@ TString& TFixed_string::format(
{ {
va_list pars; va_list pars;
va_start(pars, fmt); va_start(pars, fmt);
#ifdef WIN32
const int tot = _vsnprintf(_str, size(), fmt, pars);
#else
const int tot = vsprintf(_str, fmt, pars); const int tot = vsprintf(_str, fmt, pars);
#endif
va_end(pars); va_end(pars);
CHECK(tot >= 0 && tot <= size(), "Ue'! Quanto scrivi con 'sta format?"); CHECK(tot >= 0 && tot <= size(), "Ue'! Quanto scrivi con 'sta format?");
return *this; return *this;