From 41f2f5c0c076b5a9823bfba1d741d11a0f6b34a9 Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Sat, 3 Nov 2012 13:14:01 -0700
Subject: [PATCH] UT: remove mapOr.

---
 js/nodeutils.js |  5 ++++-
 js/utils.js     | 19 -------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/js/nodeutils.js b/js/nodeutils.js
index befdb4abc..1959ef87a 100644
--- a/js/nodeutils.js
+++ b/js/nodeutils.js
@@ -1,16 +1,18 @@
+var async = require("async");
 var fs	  = require("fs");
 var path  = require("path");
 
 var utils  = require("./utils.js");
 
 // Empty a directory.
+// done(err) : err = true if an error occured.
 var emptyPath = function(dirPath, done) {
   fs.readdir(dirPath, function(err, files) {
     if (err) {
       done(err);
     }
     else {
-      utils.mapOr(rmPath, files.map(function(f) { return path.join(dirPath, f); }), done);
+      async.some(files.map(function(f) { return path.join(dirPath, f); }), rmPath, done);
     }
   });
 };
@@ -53,6 +55,7 @@ var resetPath = function(dirPath, mode, done) {
 };
 
 // Remove path recursively.
+// done(err)
 var rmPath = function(dirPath, done) {
 //  console.log("rmPath: %s", dirPath);
 
diff --git a/js/utils.js b/js/utils.js
index 288445993..e51ca76ed 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -19,24 +19,6 @@ var throwErr = function(done) {
     };
 };
  
-// apply function to elements of array. Return first true value to done or undefined.
-var mapOr = function(func, array, done) {
-  if (array.length) {
-    func(array[array.length-1], function(v) {
-	if (v) {
-	  done(v);
-	}
-	else {
-	  array.length -= 1;
-	  mapOr(func, array, done);
-	}
-      });
-  }
-  else {
-    done();
-  }
-};
-
 var trace = function(comment, func) {
   return function() {
       console.log("%s: %s", trace, arguments.toString);
@@ -88,7 +70,6 @@ var stringToArray = function (s) {
   return a;
 };
 
-exports.mapOr	    = mapOr;
 exports.trace	    = trace;
 exports.arraySet    = arraySet;
 exports.hexToString = hexToString;