memfs: replace if-statement with two conditions with nested if-statements

This changes mostly for readibility.  It becomes harder to read and trace
the  state of double conditions on New() method.

1 files changed, 13 insertions, 9 deletions

diff --git a/lib/memfs/memfs.go b/lib/memfs/memfs.go
index a9669d0a..25c8362e 100644
--- a/lib/memfs/memfs.go
+++ b/lib/memfs/memfs.go
@@ -66,16 +66,18 @@ type MemFS struct {
 // excludes does not have any effect, since the content of path and nodes will
 // be overwritten by GeneratedPathNode.
 //
-func New(includes, excludes []string, withContent bool) (*MemFS, error) {
-	if !Development && GeneratedPathNode != nil {
-		mfs := &MemFS{
-			pn:   GeneratedPathNode,
-			root: GeneratedPathNode.Get("/"),
+func New(includes, excludes []string, withContent bool) (mfs *MemFS, err error) {
+	if GeneratedPathNode != nil {
+		if !Development {
+			mfs = &MemFS{
+				pn:   GeneratedPathNode,
+				root: GeneratedPathNode.Get("/"),
+			}
+			return mfs, nil
 		}
-		return mfs, nil
 	}
 
-	mfs := &MemFS{
+	mfs = &MemFS{
 		pn: &PathNode{
 			v: make(map[string]*Node),
 			f: nil,
@@ -227,8 +229,10 @@ func (mfs *MemFS) Mount(dir string) error {
 	if len(dir) == 0 {
 		return nil
 	}
-	if !Development && GeneratedPathNode != nil {
-		return nil
+	if GeneratedPathNode != nil {
+		if !Development {
+			return nil
+		}
 	}
 
 	if mfs.pn == nil {