Commit 6d40993d by Mohamed Akram

Add missing return

parent 99d7126b
...@@ -110,7 +110,12 @@ Database::Database(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Database>( ...@@ -110,7 +110,12 @@ Database::Database(const Napi::CallbackInfo& info) : Napi::ObjectWrap<Database>(
init(); init();
Napi::Env env = info.Env(); Napi::Env env = info.Env();
REQUIRE_ARGUMENT_STRING(0, filename); if (info.Length() <= 0 || !info[0].IsString()) {
Napi::TypeError::New(env, "String expected").ThrowAsJavaScriptException();
return;
}
std::string filename = info[0].As<Napi::String>();
unsigned int pos = 1; unsigned int pos = 1;
int mode; int mode;
......
...@@ -26,12 +26,14 @@ inline bool OtherIsInt(Napi::Number source) { ...@@ -26,12 +26,14 @@ inline bool OtherIsInt(Napi::Number source) {
#define REQUIRE_ARGUMENTS(n) \ #define REQUIRE_ARGUMENTS(n) \
if (info.Length() < (n)) { \ if (info.Length() < (n)) { \
Napi::TypeError::New(env, "Expected " #n "arguments").ThrowAsJavaScriptException(); \ Napi::TypeError::New(env, "Expected " #n "arguments").ThrowAsJavaScriptException(); \
return env.Null(); \
} }
#define REQUIRE_ARGUMENT_EXTERNAL(i, var) \ #define REQUIRE_ARGUMENT_EXTERNAL(i, var) \
if (info.Length() <= (i) || !info[i].IsExternal()) { \ if (info.Length() <= (i) || !info[i].IsExternal()) { \
Napi::TypeError::New(env, "Argument " #i " invalid").ThrowAsJavaScriptException(); \ Napi::TypeError::New(env, "Argument " #i " invalid").ThrowAsJavaScriptException(); \
return env.Null(); \
} \ } \
Napi::External var = info[i].As<Napi::External>(); Napi::External var = info[i].As<Napi::External>();
...@@ -39,6 +41,7 @@ inline bool OtherIsInt(Napi::Number source) { ...@@ -39,6 +41,7 @@ inline bool OtherIsInt(Napi::Number source) {
#define REQUIRE_ARGUMENT_FUNCTION(i, var) \ #define REQUIRE_ARGUMENT_FUNCTION(i, var) \
if (info.Length() <= (i) || !info[i].IsFunction()) { \ if (info.Length() <= (i) || !info[i].IsFunction()) { \
Napi::TypeError::New(env, "Argument " #i " must be a function").ThrowAsJavaScriptException(); \ Napi::TypeError::New(env, "Argument " #i " must be a function").ThrowAsJavaScriptException(); \
return env.Null(); \
} \ } \
Napi::Function var = info[i].As<Napi::Function>(); Napi::Function var = info[i].As<Napi::Function>();
...@@ -46,6 +49,7 @@ inline bool OtherIsInt(Napi::Number source) { ...@@ -46,6 +49,7 @@ inline bool OtherIsInt(Napi::Number source) {
#define REQUIRE_ARGUMENT_STRING(i, var) \ #define REQUIRE_ARGUMENT_STRING(i, var) \
if (info.Length() <= (i) || !info[i].IsString()) { \ if (info.Length() <= (i) || !info[i].IsString()) { \
Napi::TypeError::New(env, "Argument " #i " must be a string").ThrowAsJavaScriptException(); \ Napi::TypeError::New(env, "Argument " #i " must be a string").ThrowAsJavaScriptException(); \
return env.Null(); \
} \ } \
std::string var = info[i].As<Napi::String>(); std::string var = info[i].As<Napi::String>();
...@@ -61,6 +65,7 @@ inline bool OtherIsInt(Napi::Number source) { ...@@ -61,6 +65,7 @@ inline bool OtherIsInt(Napi::Number source) {
if (info.Length() > i && !info[i].IsUndefined()) { \ if (info.Length() > i && !info[i].IsUndefined()) { \
if (!info[i].IsFunction()) { \ if (!info[i].IsFunction()) { \
Napi::TypeError::New(env, "Argument " #i " must be a function").ThrowAsJavaScriptException(); \ Napi::TypeError::New(env, "Argument " #i " must be a function").ThrowAsJavaScriptException(); \
return env.Null(); \
} \ } \
var = info[i].As<Napi::Function>(); \ var = info[i].As<Napi::Function>(); \
} }
...@@ -78,6 +83,7 @@ inline bool OtherIsInt(Napi::Number source) { ...@@ -78,6 +83,7 @@ inline bool OtherIsInt(Napi::Number source) {
} \ } \
else { \ else { \
Napi::TypeError::New(env, "Argument " #i " must be an integer").ThrowAsJavaScriptException(); \ Napi::TypeError::New(env, "Argument " #i " must be an integer").ThrowAsJavaScriptException(); \
return env.Null(); \
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment