diff options
| author | joerg <joerg> | 2009-03-06 15:19:04 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-03-06 15:19:04 +0000 |
| commit | 22311358385dee7a89813e3a2b55d522c3d012be (patch) | |
| tree | 83105428e684ad14e5a8a4318b15cab38b50e1d8 /pkgtools | |
| parent | e6c88bb44868d65b07cd8a0af312769ca8be72f3 (diff) | |
| download | pkgsrc-22311358385dee7a89813e3a2b55d522c3d012be.tar.gz | |
Merge lib/dewey.c rev 1.11 from pkg_install:
Avoid sign comparision issues.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/files/pbulk/lib/match.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgtools/pbulk/files/pbulk/lib/match.c b/pkgtools/pbulk/files/pbulk/lib/match.c index e68308443b6..8e51707743d 100644 --- a/pkgtools/pbulk/files/pbulk/lib/match.c +++ b/pkgtools/pbulk/files/pbulk/lib/match.c @@ -1,4 +1,4 @@ -/* $NetBSD: match.c,v 1.3 2008/09/22 11:31:16 joerg Exp $ */ +/* $NetBSD: match.c,v 1.4 2009/03/06 15:19:04 joerg Exp $ */ /* * Copyright © 2002 Alistair G. Crooks. All rights reserved. @@ -273,9 +273,8 @@ result(int cmp, int tst) static int vtest(arr_t *lhs, int tst, arr_t *rhs) { + unsigned int c, i; int cmp; - int c; - int i; for (i = 0, c = MAX(lhs->c, rhs->c) ; i < c ; i++) { if ((cmp = DIGIT(lhs->v, lhs->c, i) - DIGIT(rhs->v, rhs->c, i)) != 0) { @@ -353,7 +352,7 @@ dewey_match(const char *pattern, const char *pkg) if (sep2) { char ver[PKG_PATTERN_MAX]; - strlcpy(ver, sep, MIN(sizeof(ver), sep2-sep+1)); + strlcpy(ver, sep, MIN((ssize_t)sizeof(ver), sep2-sep+1)); if (dewey_cmp(version, op, ver)) return 1; } |