From 6814ccf2614983d23e490580b4ad7b15be3b3ea7 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 1 Jun 2007 14:54:57 +0000 Subject: [PATCH] Patch level : 4.0 Files correlati : ve0 e dintorni Ricompilazione Demo : [ ] Commento : Corretta decodifica della tabella MAG nelle maschere git-svn-id: svn://10.65.10.50/trunk@15384 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/prefix.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/prefix.cpp b/include/prefix.cpp index e296f7e4e..81483f543 100755 --- a/include/prefix.cpp +++ b/include/prefix.cpp @@ -1340,7 +1340,7 @@ void TTable_names::fill() { const FileDes& fd = prefix().get_filedes(logic); n = fd.SysName; n = n.name(); n.upper(); - if (_names.objptr(n) == NULL) + if (_names.objptr(n) == NULL) add_file(logic, n); } _filled = prefix().get_codditta(); @@ -1351,15 +1351,18 @@ int TTable_names::logic_num(const TString& n) { // Non cambiare: n puo' essere temporaneo e pieno di spazi! TString80 name = n; name.trim(); + const int namelen = name.len(); if (isdigit(name[0]) || name[0] == '-') { int num = atoi(name); - if (name[name.len()-1] == '@') + if (name[namelen-1] == '@') num = -num; return num; } - - if (name[0] == '%' && name.len() == 4) + + if (namelen == 3) + return LF_TAB; + if (namelen == 4 && name[0] == '%') return LF_TABCOM; name.upper(); @@ -1370,9 +1373,6 @@ int TTable_names::logic_num(const TString& n) str = (TString*)_names.objptr(name); } - if (str == NULL && name.len() == 3) - return LF_TAB; - return str == NULL ? 0 : atoi(*str); }