use MakeCallback() instead of Call(), closes #62

Level · Nov 12, 2013 · 0fee1d9 · 0fee1d9
1 parent ca9064a
commit 0fee1d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/batch.cc b/src/batch.cc
@@ -167,7 +167,7 @@ NAN_METHOD(Batch::Write) {
     BatchWriteWorker* worker  = new BatchWriteWorker(batch, callback);
     NanAsyncQueueWorker(worker);
   } else {
-    LD_RUN_CALLBACK(v8::Local<v8::Function>::Cast(args[0]), NULL, 0);
+    LD_RUN_CALLBACK(v8::Local<v8::Function>::Cast(args[0]), 0, NULL);
   }
 
   NanReturnUndefined();

diff --git a/src/database.cc b/src/database.cc
@@ -280,11 +280,12 @@ NAN_METHOD(Database::Close) {
           v8::Local<v8::Value> argv[] = {
               v8::FunctionTemplate::New()->GetFunction() // empty callback
           };
-          v8::TryCatch try_catch;
-          end->Call(NanObjectWrapHandle(iterator), 1, argv);
-          if (try_catch.HasCaught()) {
-            node::FatalException(try_catch);
-          }
+          node::MakeCallback(
+              NanObjectWrapHandle(iterator)
+            , end
+            , 1
+            , argv
+          );
         }
     }
   } else {
@@ -440,7 +441,7 @@ NAN_METHOD(Database::Batch) {
     ));
   } else {
     ClearReferences(references);
-    LD_RUN_CALLBACK(callback, NULL, 0);
+    LD_RUN_CALLBACK(callback, 0, NULL);
   }
 
   NanReturnUndefined();

diff --git a/src/leveldown.h b/src/leveldown.h
@@ -73,17 +73,14 @@ static inline void DisposeStringOrBufferFromSlice(
         v8::String::New(msg))                                                  \
       )                                                                        \
     };                                                                         \
-    LD_RUN_CALLBACK(callback, argv, 1)                                         \
+    LD_RUN_CALLBACK(callback, 1, argv)                                         \
     NanReturnUndefined();                                                      \
   }                                                                            \
   return NanThrowError(msg);
 
-#define LD_RUN_CALLBACK(callback, argv, length)                                \
-  v8::TryCatch try_catch;                                                      \
-  callback->Call(v8::Context::GetCurrent()->Global(), length, argv);           \
-  if (try_catch.HasCaught()) {                                                 \
-    node::FatalException(try_catch);                                           \
-  }
+#define LD_RUN_CALLBACK(callback, argc, argv)                                  \
+  node::MakeCallback(                                                          \
+      v8::Context::GetCurrent()->Global(), callback, argc, argv);
 
 /* LD_METHOD_SETUP_COMMON setup the following objects:
  *  - Database* database