[Plib-cvs] plib/src/ssg ssg.h,1.148,1.149 ssgBase.cxx,1.20,1.21 ssgIO.cxx,1.37,1.38 ssgLoad.cxx,1.24
Brought to you by:
sjbaker
Menu
▾
▴
[Plib-cvs] plib/src/ssg ssg.h,1.148,1.149 ssgBase.cxx,1.20,1.21 ssgIO.cxx,1.37,1.38 ssgLoad.cxx,1.24,1.25 ssgLoadAC.cxx,1.29,1.30 ssgLoadASE.cxx,1.44,1.45 ssgLoadATG.cxx,1.17,1.18 ssgLoadDXF.cxx,1.26,1.27 ssgLoadIV.cxx,1.10,1.11 ssgLoadOBJ.cxx,1.22,1.23 ssgLoadVRML1.cxx,1.10,1.11 ssgLoaderWriterStuff.cxx,1.28,1.29 ssgSave3ds.cxx,1.7,1.8
|
From: Sebastian U. <ud...@us...> - 2002-09-15 01:29:15
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv24925
Modified Files:
ssg.h ssgBase.cxx ssgIO.cxx ssgLoad.cxx ssgLoadAC.cxx
ssgLoadASE.cxx ssgLoadATG.cxx ssgLoadDXF.cxx ssgLoadIV.cxx
ssgLoadOBJ.cxx ssgLoadVRML1.cxx ssgLoaderWriterStuff.cxx
ssgSave3ds.cxx
Log Message:
Replaced some instances of 'new' + strcpy () with ulStrDup ()
Index: ssg.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- ssg.h 9 Sep 2002 09:08:29 -0000 1.148
+++ ssg.h 15 Sep 2002 01:29:11 -0000 1.149
@@ -728,10 +728,7 @@
if ( fname == NULL )
filename = NULL ;
else
- {
- filename = new char [ strlen(fname)+1 ] ;
- strcpy ( filename, fname ) ;
- }
+ filename = ulStrDup ( fname ) ;
}
virtual void print ( FILE *fd = stderr, char *indent = "", int how_much = 2 ) ;
Index: ssgBase.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgBase.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ssgBase.cxx 2 Sep 2002 06:05:47 -0000 1.20
+++ ssgBase.cxx 15 Sep 2002 01:29:11 -0000 1.21
@@ -95,10 +95,7 @@
if ( nm == NULL )
name = NULL ;
else
- {
- name = new char [ strlen ( nm ) + 1 ] ;
- strcpy ( name, nm ) ;
- }
+ name = ulStrDup ( nm ) ;
}
void ssgBase::zeroSpareRecursive (){ zeroSpare () ; }
Index: ssgIO.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgIO.cxx,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ssgIO.cxx 2 Sep 2002 06:05:48 -0000 1.37
+++ ssgIO.cxx 15 Sep 2002 01:29:11 -0000 1.38
@@ -217,10 +217,7 @@
if ( s[0] == '\0' )
*var = NULL ;
else
- {
- *var = new char [ strlen(s)+1 ] ;
- strcpy ( *var, s ) ;
- }
+ *var = ulStrDup ( s ) ;
}
Index: ssgLoad.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ssgLoad.cxx 2 Sep 2002 06:05:48 -0000 1.24
+++ ssgLoad.cxx 15 Sep 2002 01:29:11 -0000 1.25
@@ -137,15 +137,13 @@
void ssgLoaderOptions::setModelDir ( const char *s )
{
delete [] model_dir ;
- model_dir = new char [ strlen ( s ) + 1 ] ;
- strcpy ( model_dir, s ) ;
+ model_dir = ulStrDup ( s ) ;
}
void ssgLoaderOptions::setTextureDir ( const char *s )
{
delete [] texture_dir ;
- texture_dir = new char [ strlen ( s ) + 1 ] ;
- strcpy ( texture_dir, s ) ;
+ texture_dir = ulStrDup ( s ) ;
}
Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ssgLoadAC.cxx 2 Sep 2002 06:05:48 -0000 1.29
+++ ssgLoadAC.cxx 15 Sep 2002 01:29:11 -0000 1.30
@@ -382,10 +382,7 @@
if ( s == NULL || s[0] == '\0' )
current_tfname = NULL ;
else
- {
- current_tfname = new char [ strlen(s)+1 ] ;
- strcpy ( current_tfname, s ) ;
- }
+ current_tfname = ulStrDup ( s ) ;
return PARSE_CONT ;
}
Index: ssgLoadASE.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadASE.cxx,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ssgLoadASE.cxx 2 Sep 2002 06:05:48 -0000 1.44
+++ ssgLoadASE.cxx 15 Sep 2002 01:29:11 -0000 1.45
@@ -361,16 +361,15 @@
char* fname;
if (! parser.parseString(fname, "bitmap filename") )
return FALSE;
-
+
//strip existing directory from fname
char* slash = strrchr ( fname, '/' ) ;
if ( !slash )
slash = strrchr ( fname, '\\' ) ; //for dos
if ( slash )
fname = slash + 1 ;
-
- mat->tfname = new char [ strlen(fname)+1 ] ;
- strcpy ( mat->tfname, fname ) ;
+
+ mat->tfname = ulStrDup ( fname ) ;
}
}
else if (!strcmp(token,"*UVW_U_TILING"))
@@ -438,14 +437,10 @@
char buff [ 256 ] ;
sprintf( buff, "%s, sub#%d", mat_name, sub_index );
- mat->name = new char [ strlen(buff)+1 ] ;
- strcpy ( mat->name, buff ) ;
+ mat->name = ulStrDup ( buff ) ;
}
else
- {
- mat->name = new char [ strlen(name)+1 ] ;
- strcpy ( mat->name, name ) ;
- }
+ mat->name = ulStrDup ( name ) ;
}
else if (!strcmp(token,"*MATERIAL_AMBIENT"))
{
@@ -1250,8 +1245,7 @@
return FALSE;
- obj->name = new char [ strlen(name)+1 ] ;
- strcpy ( obj->name, name ) ;
+ obj->name = ulStrDup ( name ) ;
}
}
else if (!strcmp(token,"*NODE_PARENT"))
@@ -1263,8 +1257,7 @@
return FALSE;
- obj->parent = new char [ strlen(name)+1 ] ;
- strcpy ( obj->parent, name ) ;
+ obj->parent = ulStrDup ( name ) ;
}
}
else if (!strcmp(token,"*NODE_TM"))
Index: ssgLoadATG.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadATG.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ssgLoadATG.cxx 2 Sep 2002 06:05:48 -0000 1.17
+++ ssgLoadATG.cxx 15 Sep 2002 01:29:11 -0000 1.18
@@ -155,8 +155,7 @@
{
if ( _current_usemtl != NULL )
delete [] _current_usemtl ;
- _current_usemtl = new char [ strlen ( usemtl ) + 1 ] ;
- strcpy ( _current_usemtl, usemtl ) ;
+ _current_usemtl = ulStrDup ( usemtl ) ;
}
}
//# gbs -2710586.16105 -4275323.15743 3867065.62925 7623.60
@@ -298,8 +297,7 @@
// bring _last_usemtl up to date
if ( _last_usemtl != NULL )
delete [] _last_usemtl;
- _last_usemtl= new char [ strlen ( _current_usemtl ) + 1 ] ;
- strcpy ( _last_usemtl, _current_usemtl ) ;
+ _last_usemtl= ulStrDup ( _current_usemtl ) ;
// create SimpleState
Index: ssgLoadDXF.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadDXF.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ssgLoadDXF.cxx 2 Sep 2002 06:05:48 -0000 1.26
+++ ssgLoadDXF.cxx 15 Sep 2002 01:29:11 -0000 1.27
@@ -777,14 +777,11 @@
if ( ent_type == ENT_INSERT || current_block != NULL ) {
- if ( ent_type == ENT_INSERT && block_name == NULL ) {
- block_name = new char[ strlen(input2)+1 ] ;
- strcpy ( block_name, input2 ) ;
- }
+ if ( ent_type == ENT_INSERT && block_name == NULL )
+ block_name = ulStrDup ( input2 ) ;
if ( current_block != NULL && current_block->getName() == NULL ) {
- char* name = new char[ strlen(input2)+1 ] ;
- strcpy ( name, input2 ) ;
+ char* name = ulStrDup ( input2 ) ;
current_block->setName( name ) ;
}
}
Index: ssgLoadIV.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadIV.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ssgLoadIV.cxx 2 Sep 2002 06:05:48 -0000 1.10
+++ ssgLoadIV.cxx 15 Sep 2002 01:29:12 -0000 1.11
@@ -344,8 +344,7 @@
vrmlParser.expectNextToken("filename");
if( !vrmlParser.getNextString( token, NULL ) )
return FALSE;
- fileName = new char[ strlen( token ) + 1 ];
- strcpy( fileName, token );
+ fileName = ulStrDup ( token ) ;
}
else if( !strcmp( token, "wrapS") )
{
Index: ssgLoadOBJ.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadOBJ.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ssgLoadOBJ.cxx 2 Sep 2002 06:05:48 -0000 1.22
+++ ssgLoadOBJ.cxx 15 Sep 2002 01:29:12 -0000 1.23
@@ -241,8 +241,7 @@
if ( count == 1 ) {
index ++ ;
memset( &materials[ index ], 0, sizeof(matData) ) ;
- materials[ index ].name = new char [ strlen ( name ) + 1 ] ;
- strcpy ( materials[ index ].name, name ) ;
+ materials[ index ].name = ulStrDup ( name ) ;
materials[ index ].amb[3] = 1.0f ;
materials[ index ].diff[3] = 1.0f ;
materials[ index ].spec[3] = 1.0f ;
@@ -285,10 +284,8 @@
char tfname[MAX_LINE_LEN];
count = sscanf ( next, "%s%n", tfname, &width ) ;
- if ( count == 1 && index >= 0 ) {
- materials[ index ].tfname = new char [ strlen( tfname )+1 ] ;
- strcpy ( materials[ index ].tfname, tfname ) ;
- }
+ if ( count == 1 && index >= 0 )
+ materials[ index ].tfname = ulStrDup ( tfname ) ;
}
}
Index: ssgLoadVRML1.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadVRML1.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ssgLoadVRML1.cxx 2 Sep 2002 06:05:48 -0000 1.10
+++ ssgLoadVRML1.cxx 15 Sep 2002 01:29:12 -0000 1.11
@@ -236,8 +236,7 @@
ulSetError(UL_DEBUG, "DEF: Found an object definition %s.", token);
if( childDefName != NULL )
delete [] childDefName;
- childDefName = new char[ strlen( token ) + 1];
- strcpy( childDefName, token );
+ childDefName = ulStrDup ( token ) ;
}
else if( !strcmp( token, "USE" ) )
{
Index: ssgLoaderWriterStuff.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoaderWriterStuff.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ssgLoaderWriterStuff.cxx 9 Sep 2002 09:01:18 -0000 1.28
+++ ssgLoaderWriterStuff.cxx 15 Sep 2002 01:29:12 -0000 1.29
@@ -677,10 +677,7 @@
if ( !meshName )
name = NULL;
else
- {
- name = new char [ strlen(meshName) + 1 ];
- strcpy(name, meshName);
- }
+ name = ulStrDup(meshName);
}
Index: ssgSave3ds.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgSave3ds.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ssgSave3ds.cxx 2 Sep 2002 06:05:48 -0000 1.7
+++ ssgSave3ds.cxx 15 Sep 2002 01:29:12 -0000 1.8
@@ -260,8 +260,7 @@
static _ssgSave3dsChunk* create_facemat_chunk( ssgLeaf* leaf ) {
char* matname = get_material_name( (ssgSimpleState*)leaf->getState() );
- char* namecopy = new char[ strlen(matname)+1 ];
- strcpy(namecopy, matname);
+ char* namecopy = ulStrDup ( matname ) ;
_ssgSave3dsData* namedata = new _ssgSave3dsData(namecopy, 1,
strlen(matname) + 1);
@@ -361,8 +360,7 @@
_ssgSave3dsChunk* objs = new _ssgSave3dsChunk(CHUNK_OBJBLOCK);
static const char const_objname[] = "Object written by ssgSave3ds";
- char *objname = new char[ strlen(const_objname) + 1 ];
- strcpy(objname, const_objname);
+ char *objname = ulStrDup ( const_objname ) ;
objs->addData( new _ssgSave3dsData(objname, 1, strlen(objname)+1) );
parent->addKid(objs);
@@ -411,8 +409,7 @@
_ssgSave3dsChunk *map_chunk = new _ssgSave3dsChunk(CHUNK_TEXTURE);
_ssgSave3dsChunk *mapname_chunk = new _ssgSave3dsChunk(CHUNK_MAPFILENAME);
- char *mapname = new char[ strlen(state->getTextureFilename()) + 1 ];
- strcpy(mapname, state->getTextureFilename());
+ char *mapname = ulStrDup(state->getTextureFilename());
mapname_chunk -> addData( new _ssgSave3dsData(mapname, 1,
strlen(mapname) + 1) );
map_chunk -> addKid(mapname_chunk);
@@ -430,10 +427,9 @@
_ssgSave3dsChunk *matname_chunk = new _ssgSave3dsChunk(CHUNK_MATNAME);
char *matname;
- if (state->getName() != NULL) {
- matname = new char[ strlen(state->getName()) + 1 ];
- strcpy(matname, state->getName());
- } else {
+ if (state->getName() != NULL)
+ matname = ulStrDup(state->getName());
+ else {
matname = new char[16];
sprintf(matname, "Material #%d", mat_count);
}
|
