diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 02:08:23 +0200 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 02:08:23 +0200 |
| commit | a79616278e15a61eb899bc5b582094c063214238 (patch) | |
| tree | 9e1cfdd0f28fd81f922463f4fb3f3f8e6863e6c3 /monitor_mm.c | |
| parent | - stevesk@cvs.openbsd.org 2002/06/27 19:49:08 (diff) | |
| download | openssh-a79616278e15a61eb899bc5b582094c063214238.tar.xz openssh-a79616278e15a61eb899bc5b582094c063214238.zip | |
- millert@cvs.openbsd.org 2002/06/28 01:49:31
[monitor_mm.c]
tree(3) wants an int return value for its compare functions and
the difference between two pointers is not an int. Just do the
safest thing and store the result in a long and then return 0,
-1, or 1 based on that result.
Diffstat (limited to '')
| -rw-r--r-- | monitor_mm.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/monitor_mm.c b/monitor_mm.c index c363036e6..f72a180ea 100644 --- a/monitor_mm.c +++ b/monitor_mm.c @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_mm.c,v 1.6 2002/06/04 23:05:49 markus Exp $"); +RCSID("$OpenBSD: monitor_mm.c,v 1.7 2002/06/28 01:49:31 millert Exp $"); #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> @@ -38,7 +38,14 @@ RCSID("$OpenBSD: monitor_mm.c,v 1.6 2002/06/04 23:05:49 markus Exp $"); static int mm_compare(struct mm_share *a, struct mm_share *b) { - return ((char *)a->address - (char *)b->address); + long diff = (char *)a->address - (char *)b->address; + + if (diff == 0) + return (0); + else if (diff < 0) + return (-1); + else + return (1); } RB_GENERATE(mmtree, mm_share, next, mm_compare) |