bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style-match rpmvercmp code with upstream

Browse source 
Not sure how or why some of this differed, but it is easy enough to set
it back to how it was so it is easier to diff.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-23 01:47:45 -05:00
parent a8a4395098
commit cc03d6366a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/libalpm/version.c
View file

@ -102,12 +102,12 @@ static int rpmvercmp(const char *a, const char *b)
two = str2; two = str2;
/* loop through each version segment of str1 and str2 and compare them */ /* loop through each version segment of str1 and str2 and compare them */
while(*one && *two) { while (*one && *two) {
while(*one && !isalnum((int)*one)) one++; while (*one && !isalnum((int)*one)) one++;
while(*two && !isalnum((int)*two)) two++; while (*two && !isalnum((int)*two)) two++;
/* If we ran to the end of either, we are finished with the loop */ /* If we ran to the end of either, we are finished with the loop */
if(!(*one && *two)) break; if (!(*one && *two)) break;
ptr1 = one; ptr1 = one;
ptr2 = two; ptr2 = two;
@ -115,13 +115,13 @@ static int rpmvercmp(const char *a, const char *b)
/* grab first completely alpha or completely numeric segment */ /* grab first completely alpha or completely numeric segment */
/* leave one and two pointing to the start of the alpha or numeric */ /* leave one and two pointing to the start of the alpha or numeric */
/* segment and walk ptr1 and ptr2 to end of segment */ /* segment and walk ptr1 and ptr2 to end of segment */
if(isdigit((int)*ptr1)) { if (isdigit((int)*ptr1)) {
while(*ptr1 && isdigit((int)*ptr1)) ptr1++; while (*ptr1 && isdigit((int)*ptr1)) ptr1++;
while(*ptr2 && isdigit((int)*ptr2)) ptr2++; while (*ptr2 && isdigit((int)*ptr2)) ptr2++;
isnum = 1; isnum = 1;
} else { } else {
while(*ptr1 && isalpha((int)*ptr1)) ptr1++; while (*ptr1 && isalpha((int)*ptr1)) ptr1++;
while(*ptr2 && isalpha((int)*ptr2)) ptr2++; while (*ptr2 && isalpha((int)*ptr2)) ptr2++;
isnum = 0; isnum = 0;
} }