remove EncodeBinary in favor of node::Encode

seanmonstar · seanmonstar · commit b8be6a5f5593 · 2012-08-02T15:23:13.000-07:00
this was made linkable with nodejs v0.8.5
diff --git a/src/bcrypt_node.cc b/src/bcrypt_node.cc
@@ -194,21 +194,6 @@ bool ValidateSalt(const char* salt) {
     return true;
 }
 
-Local<Value> EncodeBinary(const void *buf, size_t len) {
-	HandleScope scope;
-
-	if (!len) return scope.Close(String::Empty());
-
-	const unsigned char *cbuf = static_cast<const unsigned char*>(buf);
-	uint16_t * twobytebuf = new uint16_t[len];
-	for (size_t i = 0; i < len; i++) {
-		// XXX is the following line platform independent?
-		twobytebuf[i] = cbuf[i];
-	}
-	Local<String> chunk = String::New(twobytebuf, len);
-	delete [] twobytebuf; // TODO use ExternalTwoByteString?
-	return scope.Close(chunk);
-}
 
 /* SALT GENERATION */
 void GenSaltAsync(uv_work_t* req) {
@@ -242,7 +227,7 @@ void GenSaltAsyncAfter(uv_work_t* req) {
     }
     else {
         argv[0] = Undefined();
-        argv[1] = EncodeBinary(baton->salt.c_str(), baton->salt.size());
+        argv[1] = Encode(baton->salt.c_str(), baton->salt.size(), BINARY);
     }
 
     TryCatch try_catch; // don't quite see the necessity of this
@@ -293,7 +278,7 @@ Handle<Value> GenerateSaltSync(const Arguments& args) {
     char salt[_SALT_LEN];
     bcrypt_gensalt(rounds, seed.get(), salt);
 
-    return scope.Close(EncodeBinary(salt, strlen(salt)));
+    return scope.Close(Encode(salt, strlen(salt), BINARY));
 }
 
 /* ENCRYPT DATA - USED TO BE HASHPW */
@@ -323,7 +308,7 @@ void EncryptAsyncAfter(uv_work_t* req) {
     }
     else {
         argv[0] = Undefined();
-        argv[1] = EncodeBinary(baton->output.c_str(), baton->output.size());
+        argv[1] = Encode(baton->output.c_str(), baton->output.size(), BINARY);
     }
 
     TryCatch try_catch; // don't quite see the necessity of this
@@ -367,7 +352,7 @@ Handle<Value> EncryptSync(const Arguments& args) {
 
     char bcrypted[_PASSWORD_LEN];
     bcrypt(*data, *salt, bcrypted);
-    return scope.Close(EncodeBinary(bcrypted, strlen(bcrypted)));
+    return scope.Close(Encode(bcrypted, strlen(bcrypted), BINARY));
 }
 
 /* COMPARATOR */
@@ -491,4 +476,4 @@ extern "C" void init(Handle<Object> target) {
     NODE_SET_METHOD(target, "compare", Compare);
 };
 
-NODE_MODULE(bcrypt_lib, init);
+NODE_MODULE(bcrypt_lib, init);
