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

Patch level : 4.0

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Tolte strcpy DEPRECATED che servivano solo a copiare stringhe costanti!


git-svn-id: svn://10.65.10.50/trunk@15204 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2007-04-10 09:28:58 +00:00
parent b0775f45e0
commit 0cc67aaf63
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mg/mglib.h
View File

@ -248,11 +248,11 @@ class TMetachar : public TObject
{ {
TR_automa * _au; TR_automa * _au;
TString _language; TString _language;
char _metach_mand[10];
char _metach_opz[10];
protected:
void set_language(const char * language); // setta l'automa che ricosce il linguaggio passato void set_language(const char * language); // setta l'automa che ricosce il linguaggio passato
void add_tran(int statenum,unsigned char symbol,int next);// aggiunge le transizioni all'automa void add_tran(int statenum,unsigned char symbol,int next);// aggiunge le transizioni all'automa
public: public:
// @cmember restituisce la lunghezza massima della stringa che soddisfa il formato passato // @cmember restituisce la lunghezza massima della stringa che soddisfa il formato passato
static int maxstrlen(const char * format); static int maxstrlen(const char * format);
@ -263,8 +263,9 @@ public:
bool has_opzchars(const char * pattern); bool has_opzchars(const char * pattern);
bool has_mandchars(const char * pattern); bool has_mandchars(const char * pattern);
const char *mand_chars() {return _metach_mand;}; const char* const mand_chars() {return "0LA&"; }
const char *opz_chars() {return _metach_opz;}; const char* const opz_chars() {return "#9?ac"; }
TMetachar(const char * str); TMetachar(const char * str);
TMetachar(); TMetachar();
virtual ~TMetachar(); virtual ~TMetachar();

14
mg/mglib01.cpp
View File

@ -452,12 +452,7 @@ void TMetachar::set_language(const char * language)
int s; int s;
bool escaped_char=FALSE; bool escaped_char=FALSE;
TString label("-"),nextlabel("-"); TString label("-"),nextlabel("-");
// crea gli insiemi di metacaratteri standard
strcpy(_metach_mand,"0LA&");
strcpy(_metach_opz,"#9?ac");
_language=language; _language=language;
// crea l'automa // crea l'automa
_au->reset_state(); _au->reset_state();
@ -526,7 +521,7 @@ bool TMetachar::has_opzchars(const char * pattern)
while (pattern[i]) while (pattern[i])
{ {
if (!next_literal && strchr(_metach_opz,pattern[i])) if (!next_literal && strchr(opz_chars(),pattern[i]))
return(TRUE); return(TRUE);
next_literal=(!next_literal && pattern[i]==C_ESCAPEMETA); next_literal=(!next_literal && pattern[i]==C_ESCAPEMETA);
i++; i++;
@ -542,7 +537,7 @@ bool TMetachar::has_mandchars(const char * pattern)
while (pattern[i]) while (pattern[i])
{ {
if (next_literal || strchr(_metach_mand,pattern[i])) if (next_literal || strchr(mand_chars(),pattern[i]))
return(TRUE); return(TRUE);
next_literal=(!next_literal && pattern[i]==C_ESCAPEMETA); next_literal=(!next_literal && pattern[i]==C_ESCAPEMETA);
i++; i++;
@ -615,7 +610,6 @@ void TCodice_livelli::test_firm()
void TCodice_livelli::load(bool enabled, const char *tabname,const char *tabgrp) void TCodice_livelli::load(bool enabled, const char *tabname,const char *tabgrp)
{ {
TTable _tabformato(tabname); TTable _tabformato(tabname);
int e;
_lev_enabled = enabled; _lev_enabled = enabled;
_last_level=0; _last_level=0;
@ -629,7 +623,7 @@ void TCodice_livelli::load(bool enabled, const char *tabname,const char *tabgrp)
} }
if (_lev_enabled) if (_lev_enabled)
{ {
e = _tabformato.first(); int e = _tabformato.first();
for (int i=0; e == NOERR && i < max_levels(); i++) for (int i=0; e == NOERR && i < max_levels(); i++)
{ {
_name[i]=_tabformato.get("S0"); _name[i]=_tabformato.get("S0");