clean up compare for diskloc class a little had some dup code

1 files changed, 2 insertions, 7 deletions

diff --git a/db/storage.h b/db/storage.h
index 2ce70926c10..5e4f43f77f3 100644
--- a/db/storage.h
+++ b/db/storage.h
@@ -89,14 +89,9 @@ public:
 		int x = fileNo - b.fileNo;
 		if( x ) 
 			return x;
-		if( ofs == b.ofs ) return 0;
-		return ofs < b.ofs ? -1 : 1;
-	}
-	bool operator<(const DiskLoc& b) const { 
-		if( fileNo == b.fileNo )
-			return ofs < b.ofs;
-		return fileNo < b.fileNo;
+        return ofs - b.ofs;
 	}
+    bool operator<(const DiskLoc& b) const { return compare(b) < 0; }
 
 	/* get the "thing" associated with this disk location.
 	   it is assumed the object is what it is -- you must asure that: