From 1858583b3b0b9db3794a35fa9689c8c351363dbf Mon Sep 17 00:00:00 2001
From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Thu, 22 Dec 2016 17:05:52 -0800
Subject: [PATCH] Clean up after #636

freelist.lenall duplicated freelist.count.
freelist.copyall and mergepgids docs had typos.
---
 freelist.go | 15 +++------------
 page.go     |  2 +-
 tx.go       |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/freelist.go b/freelist.go
index 53efa8f..e07bf0a 100644
--- a/freelist.go
+++ b/freelist.go
@@ -46,17 +46,8 @@ func (f *freelist) pending_count() int {
 	return count
 }
 
-// lenall returns the combined number of all free ids and all pending ids.
-func (f *freelist) lenall() int {
-	n := len(f.ids)
-	for _, list := range f.pending {
-		n += len(list)
-	}
-	return n
-}
-
-// all copies into dst a list of all free ids and all pending ids in one sorted list.
-// f.lenall returns the minimum length required for dst.
+// copyall copies into dst a list of all free ids and all pending ids in one sorted list.
+// f.count returns the minimum length required for dst.
 func (f *freelist) copyall(dst []pgid) {
 	m := make(pgids, 0, len(f.pending)) // len(f.pending) undercounts, but it is a start
 	for _, list := range f.pending {
@@ -200,7 +191,7 @@ func (f *freelist) write(p *page) error {
 
 	// The page.count can only hold up to 64k elements so if we overflow that
 	// number then we handle it by putting the size in the first element.
-	lenids := f.lenall()
+	lenids := f.count()
 	if lenids == 0 {
 		p.count = uint16(lenids)
 	} else if lenids < 0xFFFF {
diff --git a/page.go b/page.go
index ccc6666..cde403a 100644
--- a/page.go
+++ b/page.go
@@ -154,7 +154,7 @@ func (a pgids) merge(b pgids) pgids {
 	return merged
 }
 
-// merge copies the sorted union of a and b into dst.
+// mergepgids copies the sorted union of a and b into dst.
 // If dst is too small, it panics.
 func mergepgids(dst, a, b pgids) {
 	if len(dst) < len(a)+len(b) {
diff --git a/tx.go b/tx.go
index 37a8ca1..6700308 100644
--- a/tx.go
+++ b/tx.go
@@ -381,7 +381,7 @@ func (tx *Tx) Check() <-chan error {
 func (tx *Tx) check(ch chan error) {
 	// Check if any pages are double freed.
 	freed := make(map[pgid]bool)
-	all := make([]pgid, tx.db.freelist.lenall())
+	all := make([]pgid, tx.db.freelist.count())
 	tx.db.freelist.copyall(all)
 	for _, id := range all {
 		if freed[id] {