From 78e885103e94a806e07f9683520811065d7a447b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 2 Feb 2003 21:53:23 +0000 Subject: [PATCH] Update. 2003-01-25 Jim Meyering * io/ftw.c (object_compare): Compare inode numbers before device numbers, since the former are much more likely to differ. --- ChangeLog | 5 +++++ io/ftw.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80df15d..5c711b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-25 Jim Meyering + + * io/ftw.c (object_compare): Compare inode numbers before device + numbers, since the former are much more likely to differ. + 2003-02-01 Ulrich Drepper * time/tzfile.c (__tzfile_compute): Change return value type to diff --git a/io/ftw.c b/io/ftw.c index 26dd77f..6b11776 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -157,10 +157,10 @@ object_compare (const void *p1, const void *p2) accidentally compare `holes' in the structure. */ const struct known_object *kp1 = p1, *kp2 = p2; int cmp1; - cmp1 = (kp1->dev > kp2->dev) - (kp1->dev < kp2->dev); + cmp1 = (kp1->ino > kp2->ino) - (kp1->ino < kp2->ino); if (cmp1 != 0) return cmp1; - return (kp1->ino > kp2->ino) - (kp1->ino < kp2->ino); + return (kp1->dev > kp2->dev) - (kp1->dev < kp2->dev); } -- 2.7.4