Skip to content

Commit

Permalink
Change GetTokenLexeme() to GetNextToken()
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Mar 25, 2016
1 parent fc8ccba commit 7573b87
Show file tree
Hide file tree
Showing 21 changed files with 420 additions and 420 deletions.
258 changes: 129 additions & 129 deletions coders/svg.c
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions magick/coder.c
View file
Expand Up @@ -832,7 +832,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
/*
Interpret XML.
*/
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token == '\0')
break;
(void) CopyMagickString(keyword,token,MaxTextExtent);
Expand All @@ -842,7 +842,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
Doctype element.
*/
while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleNCompare(keyword,"<!--",4) == 0)
Expand All @@ -851,7 +851,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
Comment element.
*/
while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleCompare(keyword,"<include") == 0)
Expand All @@ -862,10 +862,10 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
(void) CopyMagickString(keyword,token,MaxTextExtent);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (LocaleCompare(keyword,"file") == 0)
{
if (depth > 200)
Expand Down Expand Up @@ -924,11 +924,11 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
coder_info=(CoderInfo *) NULL;
continue;
}
GetTokenLexeme(q,(const char **) NULL,MaxTextExtent,token);
GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
switch (*keyword)
{
case 'M':
Expand Down
16 changes: 8 additions & 8 deletions magick/color.c
View file
Expand Up @@ -2238,7 +2238,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
/*
Interpret XML.
*/
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token == '\0')
break;
(void) CopyMagickString(keyword,token,MaxTextExtent);
Expand All @@ -2248,7 +2248,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
Doctype element.
*/
while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleNCompare(keyword,"<!--",4) == 0)
Expand All @@ -2257,7 +2257,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
Comment element.
*/
while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleCompare(keyword,"<include") == 0)
Expand All @@ -2268,10 +2268,10 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
(void) CopyMagickString(keyword,token,MaxTextExtent);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (LocaleCompare(keyword,"file") == 0)
{
if (depth > 200)
Expand Down Expand Up @@ -2329,11 +2329,11 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
color_info=(ColorInfo *) NULL;
continue;
}
GetTokenLexeme(q,(const char **) NULL,MaxTextExtent,token);
GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
switch (*keyword)
{
case 'C':
Expand Down
16 changes: 8 additions & 8 deletions magick/configure.c
View file
Expand Up @@ -1170,7 +1170,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
/*
Interpret XML.
*/
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token == '\0')
break;
(void) CopyMagickString(keyword,token,MaxTextExtent);
Expand All @@ -1180,7 +1180,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
Doctype element.
*/
while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleNCompare(keyword,"<!--",4) == 0)
Expand All @@ -1189,7 +1189,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
Comment element.
*/
while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleCompare(keyword,"<include") == 0)
Expand All @@ -1200,10 +1200,10 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
(void) CopyMagickString(keyword,token,MaxTextExtent);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (LocaleCompare(keyword,"file") == 0)
{
if (depth > 200)
Expand Down Expand Up @@ -1265,11 +1265,11 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
/*
Parse configure element.
*/
GetTokenLexeme(q,(const char **) NULL,MaxTextExtent,token);
GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
switch (*keyword)
{
case 'N':
Expand Down
20 changes: 10 additions & 10 deletions magick/delegate.c
View file
Expand Up @@ -968,7 +968,7 @@ MagickExport MagickBooleanType GetDelegateThreadSupport(
% MagickToken() gets a token from the token stream. A token is defined as
% a sequence of characters delimited by whitespace (e.g. clip-path), a
% sequence delimited with quotes (.e.g "Quote me"), or a sequence enclosed in
% parenthesis (e.g. rgb(0,0,0)). GetTokenLexeme() also recognizes these
% parenthesis (e.g. rgb(0,0,0)). GetNextToken() also recognizes these
% separator characters: ':', '=', ',', and ';'.
%
% The format of the MagickToken method is:
Expand All @@ -986,7 +986,7 @@ MagickExport MagickBooleanType GetDelegateThreadSupport(
*/
MagickExport void GetMagickToken(const char *start,const char **end,char *token)
{
GetTokenLexeme(start,end,~0UL,token);
GetNextToken(start,end,~0UL,token);
}

/*
Expand Down Expand Up @@ -1542,7 +1542,7 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
/*
Interpret XML.
*/
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token == '\0')
break;
(void) CopyMagickString(keyword,token,MaxTextExtent);
Expand All @@ -1552,7 +1552,7 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
Doctype element.
*/
while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleNCompare(keyword,"<!--",4) == 0)
Expand All @@ -1561,7 +1561,7 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
Comment element.
*/
while ((LocaleNCompare(q,"->",2) != 0) && (*q != '\0'))
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
continue;
}
if (LocaleCompare(keyword,"<include") == 0)
Expand All @@ -1572,10 +1572,10 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
(void) CopyMagickString(keyword,token,MaxTextExtent);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
if (LocaleCompare(keyword,"file") == 0)
{
if (depth > 200)
Expand Down Expand Up @@ -1634,11 +1634,11 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
delegate_info=(DelegateInfo *) NULL;
continue;
}
GetTokenLexeme(q,(const char **) NULL,MaxTextExtent,token);
GetNextToken(q,(const char **) NULL,MaxTextExtent,token);
if (*token != '=')
continue;
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetTokenLexeme(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
GetNextToken(q,&q,MaxTextExtent,token);
switch (*keyword)
{
case 'C':
Expand Down

0 comments on commit 7573b87

Please sign in to comment.