OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0023348: Expression 'ii >= 0' is always true. Unsigned type value is always >= 0.

Browse Source 
Redesigned the loop to work correctly with unsigned variables.
Treatment of path to source file is rewritten using OSD_Path for more clarity
Command getsourcefile corrected to return its result as Tcl string, and simplified
Error in treatment of optional arguments in substituted puts is fixed in src/DrawResources/TestCommands.tcl
Test case added: demo draw getsource
This commit is contained in:
Pawel Kowalski
2012-08-03 13:28:27 +04:00
parent 3b4c36f540
commit d33dea30d5
4 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Draw/Draw_Interpretor.cxx
View File

@@ -29,6 +29,7 @@
#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
#include <OSD_Path.hxx>
#include <string.h>
#include <tcl.h>
@@ -375,36 +376,23 @@ void Draw_Interpretor::Add(const Standard_CString n,
if (myInterp==NULL) Init();
CData* C = new CData(f,this);
Standard_Size length, num_slashes, ii, jj, kk;
Tcl_CreateCommand(myInterp,pN,CommandCmd, (ClientData) C, CommandDelete);
// add the help
Tcl_SetVar2(myInterp,"Draw_Helps",pN,pHelp,TCL_GLOBAL_ONLY);
Tcl_SetVar2(myInterp,"Draw_Groups",pGroup,pN,
TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
length = strlen(pFileName) ;
char * a_string =
new char[length + 1] ;
jj = 0 ;
num_slashes = 0 ;
ii = length ;
while (num_slashes < 3 && ii >= 0) {
if (file_name[ii] == '/') {
num_slashes += 1 ;
}
ii -= 1 ;
}
jj = 0 ;
for (kk = ii+2 , jj =0 ; kk < length ; kk++) {
a_string[jj] = file_name[kk] ;
jj += 1 ;
}
a_string[jj] = '\0' ;
Tcl_SetVar2(myInterp,"Draw_Files",pN,a_string,TCL_GLOBAL_ONLY);
delete [] a_string;
// add path to source file (keep not more than two last subdirectories)
OSD_Path aPath (pFileName);
Standard_Integer nbTrek = aPath.TrekLength();
for (Standard_Integer i = 2; i < nbTrek; i++)
aPath.RemoveATrek (1);
aPath.SetDisk("");
aPath.SetNode("");
TCollection_AsciiString aSrcPath;
aPath.SystemName (aSrcPath);
Tcl_SetVar2(myInterp,"Draw_Files",pN,aSrcPath.ToCString(),TCL_GLOBAL_ONLY);
}