diff --git a/lib/server/size.js b/lib/server/size.js index ef50ed47..55fd2d04 100644 --- a/lib/server/size.js +++ b/lib/server/size.js @@ -31,15 +31,8 @@ stopOnError = options.stopOnError; } - function calcSize(error, size) { - if (error) - if (stopOnError) - Util.exec(callback, error); - else - size = 0; - - total += size; - + function calcSize(size) { + total += size || 0; } processDir(dir, calcSize, options, function(error) { @@ -50,7 +43,7 @@ else result = total; - Util.exec(callback, error, result); + callback(error, result); }); }; @@ -79,14 +72,15 @@ if (!wasError || !stopOnError) { if (error) { wasError = true; - func(error); + callback(error); } else { isDir = stat.isDirectory(); if (!isDir) - func(null, stat.size); + func(stat.size); else if (isDir) { ++asyncRunning; + fs.readdir(dir, function(error, files) { onReaddir(error, files, dir); });