remove unused functions

pkg/ioutils/filepath.go

@@ -25,15 +25,17 @@ import (
 )
 
 // IsDirEmpty Check if a directory is empty
-func IsDirEmpty(dirname string) (bool, error) {
+func IsDirEmpty(dirname string) (status bool, err error) {
-	names, err := ReadDirNamesN(dirname, 1)
+	f, err := os.Open(dirname)
-	if err != nil && err != io.EOF {
+	if err == nil {
-		return false, err
+		defer f.Close()
+		if _, err = f.Readdirnames(1); err == io.EOF {
+			status = true
+			err = nil
 		}
-	if len(names) > 0 {
-		return false, nil
 	}
-	return true, nil
+
+	return
 }
 
 // FTW walks the file tree rooted at root, calling walkFn for each file or

pkg/ioutils/ioutils.go

@@ -1,65 +0,0 @@
-/*
- * Minio Cloud Storage, (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ioutils
-
-import (
-	"os"
-	"sort"
-)
-
-// byName implements sort.Interface for sorting os.FileInfo list.
-type byName []os.FileInfo
-
-func (f byName) Len() int           { return len(f) }
-func (f byName) Less(i, j int) bool { return f[i].Name() < f[j].Name() }
-func (f byName) Swap(i, j int)      { f[i], f[j] = f[j], f[i] }
-
-// ReadDirN reads the directory named by dirname and returns
-// a list of sorted directory entries of size 'n'.
-func ReadDirN(dirname string, n int) ([]os.FileInfo, error) {
-	f, err := os.Open(dirname)
-	if err != nil {
-		return nil, err
-	}
-	list, err := f.Readdir(n)
-	if err != nil {
-		return nil, err
-	}
-	if err = f.Close(); err != nil {
-		return nil, err
-	}
-	sort.Sort(byName(list))
-	return list, nil
-}
-
-// ReadDirNamesN reads the directory named by dirname and returns
-// a list of sorted directory names of size 'n'.
-func ReadDirNamesN(dirname string, n int) ([]string, error) {
-	f, err := os.Open(dirname)
-	if err != nil {
-		return nil, err
-	}
-	names, err := f.Readdirnames(n)
-	if err != nil {
-		return nil, err
-	}
-	if err = f.Close(); err != nil {
-		return nil, err
-	}
-	sort.Strings(names)
-	return names, nil
-}

pkg/ioutils/ioutils_test.go

@@ -17,10 +17,8 @@
 package ioutils_test
 
 import (
-	"fmt"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/minio/minio/pkg/ioutils"
@@ -35,20 +33,11 @@ type MySuite struct{}
 var _ = Suite(&MySuite{})
 
 func (s *MySuite) TestIoutils(c *C) {
-	path, err := ioutil.TempDir(os.TempDir(), "minio-")
+	path, err := ioutil.TempDir(os.TempDir(), "minio-ioutils_test")
 	c.Assert(err, IsNil)
 	defer os.RemoveAll(path)
 
-	var count int
+	status, err := ioutils.IsDirEmpty(path)
-	for count < 102 {
-		count++
-		err = os.MkdirAll(filepath.Join(path, fmt.Sprintf("minio-%d", count)), 0700)
 	c.Assert(err, IsNil)
-	}
+	c.Assert(status, Equals, True)
-	dirs, err := ioutils.ReadDirN(path, 100)
-	c.Assert(err, IsNil)
-	c.Assert(len(dirs), Equals, 100)
-	dirNames, err := ioutils.ReadDirNamesN(path, 100)
-	c.Assert(err, IsNil)
-	c.Assert(len(dirNames), Equals, 100)
 }