COMP:Fixed warnings.
This commit is contained in:
parent
94853b493a
commit
ee00616289
@ -380,13 +380,13 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr)
|
|||||||
}
|
}
|
||||||
kwsys_stl::string fexpr = expr;
|
kwsys_stl::string fexpr = expr;
|
||||||
|
|
||||||
int skip = 0;
|
kwsys_stl::string::size_type skip = 0;
|
||||||
int last_slash = 0;
|
kwsys_stl::string::size_type last_slash = 0;
|
||||||
for ( cc = 0; cc < expr.size(); cc ++ )
|
for ( cc = 0; cc < expr.size(); cc ++ )
|
||||||
{
|
{
|
||||||
if ( cc > 0 && expr[cc] == '/' && expr[cc-1] != '\\' )
|
if ( cc > 0 && expr[cc] == '/' && expr[cc-1] != '\\' )
|
||||||
{
|
{
|
||||||
last_slash = static_cast<int>(cc);
|
last_slash = cc;
|
||||||
}
|
}
|
||||||
if ( cc > 0 &&
|
if ( cc > 0 &&
|
||||||
(expr[cc] == '[' || expr[cc] == '?' || expr[cc] == '*') &&
|
(expr[cc] == '[' || expr[cc] == '?' || expr[cc] == '*') &&
|
||||||
|
@ -269,7 +269,7 @@ const unsigned char MAGIC = 0234;
|
|||||||
* Utility definitions.
|
* Utility definitions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define UCHARAT(p) ((const unsigned char*)(p))[0]
|
#define UCHARAT(p) (reinterpret_cast<const unsigned char*>(p))[0]
|
||||||
|
|
||||||
|
|
||||||
#define FAIL(m) { regerror(m); return(0); }
|
#define FAIL(m) { regerror(m); return(0); }
|
||||||
@ -316,7 +316,7 @@ static char* regatom (int*);
|
|||||||
static char* regnode (char);
|
static char* regnode (char);
|
||||||
static const char* regnext (register const char*);
|
static const char* regnext (register const char*);
|
||||||
static char* regnext (register char*);
|
static char* regnext (register char*);
|
||||||
static void regc (unsigned char);
|
static void regc (char);
|
||||||
static void reginsert (char, char*);
|
static void reginsert (char, char*);
|
||||||
static void regtail (char*, const char*);
|
static void regtail (char*, const char*);
|
||||||
static void regoptail (char*, const char*);
|
static void regoptail (char*, const char*);
|
||||||
@ -362,7 +362,7 @@ bool RegularExpression::compile (const char* exp) {
|
|||||||
regnpar = 1;
|
regnpar = 1;
|
||||||
regsize = 0L;
|
regsize = 0L;
|
||||||
regcode = ®dummy;
|
regcode = ®dummy;
|
||||||
regc(MAGIC);
|
regc(static_cast<char>(MAGIC));
|
||||||
if(!reg(0, &flags))
|
if(!reg(0, &flags))
|
||||||
{
|
{
|
||||||
printf ("RegularExpression::compile(): Error in compile.\n");
|
printf ("RegularExpression::compile(): Error in compile.\n");
|
||||||
@ -394,7 +394,7 @@ bool RegularExpression::compile (const char* exp) {
|
|||||||
regparse = exp;
|
regparse = exp;
|
||||||
regnpar = 1;
|
regnpar = 1;
|
||||||
regcode = this->program;
|
regcode = this->program;
|
||||||
regc(MAGIC);
|
regc(static_cast<char>(MAGIC));
|
||||||
reg(0, &flags);
|
reg(0, &flags);
|
||||||
|
|
||||||
// Dig out information for optimizations.
|
// Dig out information for optimizations.
|
||||||
@ -426,7 +426,7 @@ bool RegularExpression::compile (const char* exp) {
|
|||||||
for (; scan != 0; scan = regnext(scan))
|
for (; scan != 0; scan = regnext(scan))
|
||||||
if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
|
if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
|
||||||
longest = OPERAND(scan);
|
longest = OPERAND(scan);
|
||||||
len = int(strlen(OPERAND(scan)));
|
len = strlen(OPERAND(scan));
|
||||||
}
|
}
|
||||||
this->regmust = longest;
|
this->regmust = longest;
|
||||||
this->regmlen = len;
|
this->regmlen = len;
|
||||||
@ -675,7 +675,7 @@ static char* regatom (int *flagp) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
for (; rxpclass <= rxpclassend; rxpclass++)
|
for (; rxpclass <= rxpclassend; rxpclass++)
|
||||||
regc(static_cast<unsigned char>(rxpclass));
|
regc(static_cast<char>(rxpclass));
|
||||||
regparse++;
|
regparse++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -778,7 +778,7 @@ static char* regnode (char op) {
|
|||||||
/*
|
/*
|
||||||
- regc - emit (if appropriate) a byte of code
|
- regc - emit (if appropriate) a byte of code
|
||||||
*/
|
*/
|
||||||
static void regc (unsigned char b) {
|
static void regc (char b) {
|
||||||
if (regcode != ®dummy)
|
if (regcode != ®dummy)
|
||||||
*regcode++ = b;
|
*regcode++ = b;
|
||||||
else
|
else
|
||||||
@ -1018,14 +1018,14 @@ static int regmatch (const char* prog) {
|
|||||||
reginput++;
|
reginput++;
|
||||||
break;
|
break;
|
||||||
case EXACTLY:{
|
case EXACTLY:{
|
||||||
register int len;
|
register size_t len;
|
||||||
register const char* opnd;
|
register const char* opnd;
|
||||||
|
|
||||||
opnd = OPERAND(scan);
|
opnd = OPERAND(scan);
|
||||||
// Inline the first character, for speed.
|
// Inline the first character, for speed.
|
||||||
if (*opnd != *reginput)
|
if (*opnd != *reginput)
|
||||||
return (0);
|
return (0);
|
||||||
len = int(strlen(opnd));
|
len = strlen(opnd);
|
||||||
if (len > 1 && strncmp(opnd, reginput, len) != 0)
|
if (len > 1 && strncmp(opnd, reginput, len) != 0)
|
||||||
return (0);
|
return (0);
|
||||||
reginput += len;
|
reginput += len;
|
||||||
|
@ -323,7 +323,8 @@ inline RegularExpression::~RegularExpression ()
|
|||||||
*/
|
*/
|
||||||
inline kwsys_stl::string::size_type RegularExpression::start () const
|
inline kwsys_stl::string::size_type RegularExpression::start () const
|
||||||
{
|
{
|
||||||
return(this->startp[0] - searchstring);
|
return static_cast<kwsys_stl::string::size_type>(
|
||||||
|
this->startp[0] - searchstring);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -332,7 +333,8 @@ inline kwsys_stl::string::size_type RegularExpression::start () const
|
|||||||
*/
|
*/
|
||||||
inline kwsys_stl::string::size_type RegularExpression::end () const
|
inline kwsys_stl::string::size_type RegularExpression::end () const
|
||||||
{
|
{
|
||||||
return(this->endp[0] - searchstring);
|
return static_cast<kwsys_stl::string::size_type>(
|
||||||
|
this->endp[0] - searchstring);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -367,7 +369,8 @@ inline void RegularExpression::set_invalid ()
|
|||||||
*/
|
*/
|
||||||
inline kwsys_stl::string::size_type RegularExpression::start(int n) const
|
inline kwsys_stl::string::size_type RegularExpression::start(int n) const
|
||||||
{
|
{
|
||||||
return this->startp[n] - searchstring;
|
return static_cast<kwsys_stl::string::size_type>(
|
||||||
|
this->startp[n] - searchstring);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -376,7 +379,8 @@ inline kwsys_stl::string::size_type RegularExpression::start(int n) const
|
|||||||
*/
|
*/
|
||||||
inline kwsys_stl::string::size_type RegularExpression::end(int n) const
|
inline kwsys_stl::string::size_type RegularExpression::end(int n) const
|
||||||
{
|
{
|
||||||
return this->endp[n] - searchstring;
|
return static_cast<kwsys_stl::string::size_type>(
|
||||||
|
this->endp[n] - searchstring);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -390,7 +394,9 @@ inline kwsys_stl::string RegularExpression::match(int n) const
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return kwsys_stl::string(this->startp[n], this->endp[n] - this->startp[n]);
|
return kwsys_stl::string(this->startp[n],
|
||||||
|
static_cast<kwsys_stl::string::size_type>(
|
||||||
|
this->endp[n] - this->startp[n]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user