manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed useless static modifiers to local variables of ply utility functions

This commit is contained in:
Paolo Cignoni 2011-06-03 08:35:01 +00:00
parent 3d4ae1b506
commit 609d3a7141
1 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
wrap/ply/plylib.cpp
View File

@ -628,7 +628,7 @@ static inline int SkipScalarA( XFILE * fp, const int tf )
static inline int SkipScalarB( XFILE * fp, const int tf) static inline int SkipScalarB( XFILE * fp, const int tf)
{ {
static char dummy[8]; char dummy[8];
assert(fp); assert(fp);
return pb_fread(dummy,1,TypeSize[tf],fp); return pb_fread(dummy,1,TypeSize[tf],fp);
@ -636,14 +636,14 @@ static inline int SkipScalarB( XFILE * fp, const int tf)
static int ReadScalarB( XFILE * fp, void * mem, const int tf, const int tm, int fmt ) static int ReadScalarB( XFILE * fp, void * mem, const int tf, const int tm, int fmt )
{ {
static char ch; char ch;
static short sh; short sh;
static int in; int in;
static uchar uc; uchar uc;
static ushort us; ushort us;
static uint ui; uint ui;
static float fl; float fl;
static double dd; double dd;
int r = 0; int r = 0;
@ -768,14 +768,14 @@ static int ReadScalarB( XFILE * fp, void * mem, const int tf, const int tm, int
static int ReadScalarA( XFILE * fp, void * mem, const int tf, const int tm ) static int ReadScalarA( XFILE * fp, void * mem, const int tf, const int tm )
{ {
static char ch; char ch;
static short sh; short sh;
static int in; int in;
static uchar uc; uchar uc;
static ushort us; ushort us;
static uint ui; uint ui;
static float fl; float fl;
static double dd; double dd;
int r = 0; int r = 0;
@ -1028,18 +1028,18 @@ int PlyFile::OpenRead( const char * filename )
{ {
// Tokens dell'intestazione // Tokens dell'intestazione
static const char * SEP = " \t\n\r"; const char * SEP = " \t\n\r";
static const char * HEADER = "ply"; const char * HEADER = "ply";
static const char * FORMAT = "format"; const char * FORMAT = "format";
static const char * TASCII = "ascii"; const char * TASCII = "ascii";
static const char * TBINBIG = "binary_big_endian"; const char * TBINBIG = "binary_big_endian";
static const char * TBINLITTLE = "binary_little_endian"; const char * TBINLITTLE = "binary_little_endian";
static const char * COMMENT = "comment"; const char * COMMENT = "comment";
static const char * OBJ_INFO = "obj_info"; const char * OBJ_INFO = "obj_info";
static const char * ELEMENT = "element"; const char * ELEMENT = "element";
static const char * PROPERTY = "property"; const char * PROPERTY = "property";
static const char * ENDHEADER = "end_header"; const char * ENDHEADER = "end_header";
static const char * LIST = "list"; const char * LIST = "list";
const int MAXB = 512; const int MAXB = 512;
char buf[MAXB]; char buf[MAXB];
@ -1049,7 +1049,6 @@ int PlyFile::OpenRead( const char * filename )
// Predistruzione // Predistruzione
Destroy(); Destroy();
// Apertura file // Apertura file
gzfp = pb_fopen(filename,"rb"); gzfp = pb_fopen(filename,"rb");
@ -1061,7 +1060,6 @@ int PlyFile::OpenRead( const char * filename )
header.clear(); header.clear();
header.reserve(1536); header.reserve(1536);
// ********* Parsing header *********** // ********* Parsing header ***********
// Controllo header // Controllo header
@ -1087,8 +1085,8 @@ int PlyFile::OpenRead( const char * filename )
goto error; goto error;
} }
header.append(buf); header.append(buf);
char *tokenPtr;
token = strtok(buf,SEP); token = strtok_r(buf,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
@ -1099,7 +1097,7 @@ int PlyFile::OpenRead( const char * filename )
error = E_NOFORMAT; error = E_NOFORMAT;
goto error; goto error;
} }
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
@ -1116,14 +1114,13 @@ int PlyFile::OpenRead( const char * filename )
error = E_NOFORMAT; error = E_NOFORMAT;
goto error; goto error;
} }
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
goto error; goto error;
} }
version = float(atof(token)); version = float(atof(token));
//************* Ciclo lettura elementi **************** //************* Ciclo lettura elementi ****************
curelement = 0; curelement = 0;
@ -1136,7 +1133,7 @@ int PlyFile::OpenRead( const char * filename )
} }
header.append(buf); header.append(buf);
token = strtok(buf,SEP); token = strtok_r(buf,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
@ -1160,14 +1157,14 @@ int PlyFile::OpenRead( const char * filename )
else if( !strcmp(token,ELEMENT) ) else if( !strcmp(token,ELEMENT) )
{ {
// Lettura nome elemento // Lettura nome elemento
char * name = strtok(0,SEP); char * name = strtok_r(0,SEP,&tokenPtr);
if(name==0) if(name==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
goto error; goto error;
} }
// Lettura numero di elementi // Lettura numero di elementi
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(name==0) if(name==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1186,7 +1183,7 @@ int PlyFile::OpenRead( const char * filename )
error = E_PROPOUTOFELEMENT; error = E_PROPOUTOFELEMENT;
goto error; goto error;
} }
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1194,7 +1191,7 @@ int PlyFile::OpenRead( const char * filename )
} }
if( !strcmp(token,LIST) ) if( !strcmp(token,LIST) )
{ {
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1206,7 +1203,7 @@ int PlyFile::OpenRead( const char * filename )
error = E_BADTYPENAME; error = E_BADTYPENAME;
goto error; goto error;
} }
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1218,7 +1215,7 @@ int PlyFile::OpenRead( const char * filename )
error = E_BADTYPENAME; error = E_BADTYPENAME;
goto error; goto error;
} }
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1235,7 +1232,7 @@ int PlyFile::OpenRead( const char * filename )
error = E_BADTYPENAME; error = E_BADTYPENAME;
goto error; goto error;
} }
token = strtok(0,SEP); token = strtok_r(0,SEP,&tokenPtr);
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1350,7 +1347,7 @@ int PlyFile::ElemNumber( int i ) const
static bool cb_skip_bin1( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_bin1( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
static char dummy[1]; char dummy[1];
assert(fp); assert(fp);
return pb_fread(dummy,1,1,fp)!=0; return pb_fread(dummy,1,1,fp)!=0;
@ -1358,7 +1355,7 @@ static bool cb_skip_bin1( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
static bool cb_skip_bin2( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_bin2( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
static char dummy[2]; char dummy[2];
assert(fp); assert(fp);
return pb_fread(dummy,1,2,fp)!=0; return pb_fread(dummy,1,2,fp)!=0;
@ -1366,7 +1363,7 @@ static bool cb_skip_bin2( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
static bool cb_skip_bin4( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_bin4( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
static char dummy[4]; char dummy[4];
assert(fp); assert(fp);
return pb_fread(dummy,1,4,fp)!=0; return pb_fread(dummy,1,4,fp)!=0;
@ -1374,7 +1371,7 @@ static bool cb_skip_bin4( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
static bool cb_skip_bin8( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_bin8( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
static char dummy[8]; char dummy[8];
assert(fp); assert(fp);
return pb_fread(dummy,1,8,fp)!=0; return pb_fread(dummy,1,8,fp)!=0;
@ -1382,7 +1379,7 @@ static bool cb_skip_bin8( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
static bool cb_skip_float_ascii( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_float_ascii( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
static float dummy; float dummy;
assert(fp); assert(fp);
return fscanf(fp,"%f",&dummy)!=EOF; return fscanf(fp,"%f",&dummy)!=EOF;
@ -1390,7 +1387,7 @@ static bool cb_skip_float_ascii( GZFILE fp, void * /*mem*/, PropDescriptor * /*d
static bool cb_skip_int_ascii( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_int_ascii( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
static int dummy; int dummy;
assert(fp); assert(fp);
return fscanf(fp,"%d",&dummy)!=EOF; return fscanf(fp,"%d",&dummy)!=EOF;
@ -1848,10 +1845,10 @@ static bool cb_read_ascii( GZFILE fp, void * mem, PropDescriptor * d )
const int SKIP_MAX_BUF = 512; const int SKIP_MAX_BUF = 512;
static char skip_buf[SKIP_MAX_BUF];
static bool cb_skip_list_bin1( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_list_bin1( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
char skip_buf[SKIP_MAX_BUF];
uchar n; uchar n;
// Solo indici uchar // Solo indici uchar
if( pb_fread(&n,1,1,fp)==0 ) return false; if( pb_fread(&n,1,1,fp)==0 ) return false;
@ -1862,6 +1859,7 @@ static bool cb_skip_list_bin1( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/
static bool cb_skip_list_bin2( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_list_bin2( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
char skip_buf[SKIP_MAX_BUF];
uchar n; uchar n;
// Solo indici uchar // Solo indici uchar
if( pb_fread(&n,1,1,fp)==0 ) return false; if( pb_fread(&n,1,1,fp)==0 ) return false;
@ -1872,6 +1870,7 @@ static bool cb_skip_list_bin2( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/
static bool cb_skip_list_bin4( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_list_bin4( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
char skip_buf[SKIP_MAX_BUF];
uchar n; uchar n;
// Solo indici uchar // Solo indici uchar
if( pb_fread(&n,1,1,fp)==0 ) return false; if( pb_fread(&n,1,1,fp)==0 ) return false;
@ -1882,6 +1881,7 @@ static bool cb_skip_list_bin4( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/
static bool cb_skip_list_bin8( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ ) static bool cb_skip_list_bin8( GZFILE fp, void * /*mem*/, PropDescriptor * /*d*/ )
{ {
char skip_buf[SKIP_MAX_BUF];
uchar n; uchar n;
// Solo indici uchar // Solo indici uchar
if( pb_fread(&n,1,1,fp)==0 ) return false; if( pb_fread(&n,1,1,fp)==0 ) return false;