src: cleanup `Isolate::GetCurrent()`
PR-URL: https://github.com/iojs/io.js/pull/807
Reviewed-by: Ben Noordhuis <[email protected]>
Reviewed-by: Trevor Norris <[email protected]>
diff --git a/src/node.cc b/src/node.cc
index fd65fbf..c8299f9 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1687,23 +1687,21 @@
#endif
-static uid_t uid_by_name(Handle<Value> value) {
+static uid_t uid_by_name(Isolate* isolate, Handle<Value> value) {
if (value->IsUint32()) {
return static_cast<uid_t>(value->Uint32Value());
} else {
- // TODO(trevnorris): Fix to not use GetCurrent().
- node::Utf8Value name(Isolate::GetCurrent(), value);
+ node::Utf8Value name(isolate, value);
return uid_by_name(*name);
}
}
-static gid_t gid_by_name(Handle<Value> value) {
+static gid_t gid_by_name(Isolate* isolate, Handle<Value> value) {
if (value->IsUint32()) {
return static_cast<gid_t>(value->Uint32Value());
} else {
- // TODO(trevnorris): Fix to not use GetCurrent().
- node::Utf8Value name(Isolate::GetCurrent(), value);
+ node::Utf8Value name(isolate, value);
return gid_by_name(*name);
}
}
@@ -1728,7 +1726,7 @@
return env->ThrowTypeError("setgid argument must be a number or a string");
}
- gid_t gid = gid_by_name(args[0]);
+ gid_t gid = gid_by_name(env->isolate(), args[0]);
if (gid == gid_not_found) {
return env->ThrowError("setgid group id does not exist");
@@ -1747,7 +1745,7 @@
return env->ThrowTypeError("setuid argument must be a number or a string");
}
- uid_t uid = uid_by_name(args[0]);
+ uid_t uid = uid_by_name(env->isolate(), args[0]);
if (uid == uid_not_found) {
return env->ThrowError("setuid user id does not exist");
@@ -1809,7 +1807,7 @@
gid_t* groups = new gid_t[size];
for (size_t i = 0; i < size; i++) {
- gid_t gid = gid_by_name(groups_list->Get(i));
+ gid_t gid = gid_by_name(env->isolate(), groups_list->Get(i));
if (gid == gid_not_found) {
delete[] groups;
@@ -1856,7 +1854,7 @@
return env->ThrowError("initgroups user not found");
}
- extra_group = gid_by_name(args[1]);
+ extra_group = gid_by_name(env->isolate(), args[1]);
if (extra_group == gid_not_found) {
if (must_free)
