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

Patch level : 2.2

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
dongle.h        Tolto limite sulla lunghezza del nome utente
inst.cpp         Sostituito "campo.aut" cont AUT_FILE
real.cpp         Spostati  #include inutili per __LONGDOUBLE__
recarray.cpp  Tolto CHECK errato sulla chiave vuota
strings.cpp     Reso piu' efficiente il metodo TToken_string::get(int n)


git-svn-id: svn://10.65.10.50/trunk@13955 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2006-05-04 10:36:32 +00:00
parent de6cec9781
commit 097ac370cb
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dongle.h
View File

@ -18,7 +18,7 @@ class TDongle : public TObject
TDongleHardware _hardware; TDongleHardware _hardware;
TDongleType _type; TDongleType _type;
TString16 _admin, _admpwd; TString _admin, _admpwd;
word _serno, _max_users, _year_assist; word _serno, _max_users, _year_assist;
word _eprom[64]; word _eprom[64];

2
include/inst.cpp
View File

@ -499,7 +499,7 @@ bool TInstallmodule_app::install_com()
void TInstallmodule_app::run(int argc, char* argv[]) void TInstallmodule_app::run(int argc, char* argv[])
{ {
TScanner scanner("campo.aut"); TScanner scanner(AUT_FILE);
const int m = module_number(); const int m = module_number();
for (int aut = 0; aut<=m; aut++) for (int aut = 0; aut<=m; aut++)

6
include/real.cpp
View File

@ -1,6 +1,3 @@
#include <ctype.h>
#include <stdlib.h>
#include <xvt.h> #include <xvt.h>
#include <real.h> #include <real.h>
@ -374,6 +371,9 @@ long double abs(long double a)
#else #else
#include <gm.h> #include <gm.h>
//#include <ctype.h>
//#include <stdlib.h>
extern "C" extern "C"
{ {

2
include/recarray.cpp
View File

@ -86,7 +86,7 @@ void TRecord_array::set_key(TRectype* r)
const TRectype& TRecord_array::key() const const TRectype& TRecord_array::key() const
{ {
const TRectype* r = (const TRectype*)_data.objptr(0); const TRectype* r = (const TRectype*)_data.objptr(0);
CHECK(r && !r->empty(), "TRecord_array lost its key"); CHECK(r != NULL, "TRecord_array lost its key");
return *r; return *r;
} }

16
include/strings.cpp
View File

@ -1533,7 +1533,6 @@ const char* TToken_string::get(
// @xref <mf TToken_string::get_char> // @xref <mf TToken_string::get_char>
{ {
CHECK(_separator, "Corrupted TToken_string: NULL separator"); CHECK(_separator, "Corrupted TToken_string: NULL separator");
TString& spark = get_tmp_string();
if (n < 0) if (n < 0)
{ {
@ -1543,7 +1542,8 @@ const char* TToken_string::get(
_last = -1; _last = -1;
return sep ? sep+1 : _str; return sep ? sep+1 : _str;
} }
else return get(); else
return get();
} }
int sep = 0; int sep = 0;
const char * s; const char * s;
@ -1556,24 +1556,22 @@ const char* TToken_string::get(
char* p = strchr(s, _separator); char* p = strchr(s, _separator);
if (p == NULL) if (p == NULL)
{ {
spark = s;
_last = -1; _last = -1;
return s;
} }
else else
{ {
TString& spark = get_tmp_string();
*p = '\0'; *p = '\0';
spark = s; spark = s;
*p = _separator; *p = _separator;
_last = (int)((const char*)p - _str) + 1; _last = (int)((const char*)p - _str) + 1;
return spark;
} }
} }
else
{
_last = -1;
return NULL;
}
return spark; _last = -1;
return NULL;
} }
// Certified 99% // Certified 99%