Skip to content

Commit

Permalink
tool_urlglob.c: reverse two loops
Browse files Browse the repository at this point in the history
By counting from 0 and up instead of backwards like before, we remove
the need for the "funny" check of the unsigned variable when decreased
passed zero. Easier to read and less risk for compiler warnings.
  • Loading branch information
bagder committed Dec 14, 2014
1 parent 64854c0 commit dc19789
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions src/tool_urlglob.c
Expand Up @@ -465,8 +465,7 @@ void glob_cleanup(URLGlob* glob)
size_t i;
int elem;

/* the < condition is required since i underflows! */
for(i = glob->size - 1; (i >= 0) && (i < glob->size); --i) {
for(i = 0; i < glob->size; i++) {
if((glob->pattern[i].type == UPTSet) &&
(glob->pattern[i].content.Set.elements)) {
for(elem = glob->pattern[i].content.Set.size - 1;
Expand All @@ -485,7 +484,6 @@ int glob_next_url(char **globbed, URLGlob *glob)
{
URLPattern *pat;
size_t i;
size_t j;
size_t len;
size_t buflen = glob->urllen + 1;
char *buf = glob->glob_buffer;
Expand All @@ -498,9 +496,8 @@ int glob_next_url(char **globbed, URLGlob *glob)
bool carry = TRUE;

/* implement a counter over the index ranges of all patterns,
starting with the rightmost pattern */
/* the < condition is required since i underflows! */
for(i = glob->size - 1; carry && (i >= 0) && (i < glob->size); --i) {
starting with the leftmost pattern */
for(i = 0; carry && (i < glob->size); i++) {
carry = FALSE;
pat = &glob->pattern[i];
switch (pat->type) {
Expand All @@ -512,8 +509,9 @@ int glob_next_url(char **globbed, URLGlob *glob)
}
break;
case UPTCharRange:
pat->content.CharRange.ptr_c = (char)(pat->content.CharRange.step +
(int)((unsigned char)pat->content.CharRange.ptr_c));
pat->content.CharRange.ptr_c =
(char)(pat->content.CharRange.step +
(int)((unsigned char)pat->content.CharRange.ptr_c));
if(pat->content.CharRange.ptr_c > pat->content.CharRange.max_c) {
pat->content.CharRange.ptr_c = pat->content.CharRange.min_c;
carry = TRUE;
Expand All @@ -537,8 +535,8 @@ int glob_next_url(char **globbed, URLGlob *glob)
}
}

for(j = 0; j < glob->size; ++j) {
pat = &glob->pattern[j];
for(i = 0; i < glob->size; ++i) {
pat = &glob->pattern[i];
switch(pat->type) {
case UPTSet:
if(pat->content.Set.elements) {
Expand Down

0 comments on commit dc19789

Please sign in to comment.