summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYazhong Liu <yorkiefixer@gmail.com>2014-08-14 02:02:37 +0800
committerTrevor Norris <trev.norris@gmail.com>2014-08-19 10:23:20 -0700
commit7be96f52857732d64d88ea98d70308f97a7ddf97 (patch)
tree09003d9bbb7760908d7730913514f29509e3919b
parentb9960eefc2093ea639353171189652b7cf116326 (diff)
downloadnodejs-7be96f52857732d64d88ea98d70308f97a7ddf97.tar.gz
nodejs-7be96f52857732d64d88ea98d70308f97a7ddf97.tar.bz2
nodejs-7be96f52857732d64d88ea98d70308f97a7ddf97.zip
src: add missing Isolate arguments
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
-rw-r--r--src/node_file.cc2
-rw-r--r--src/stream_wrap.cc6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/node_file.cc b/src/node_file.cc
index d62fbe2ab..3b287ec1c 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -836,7 +836,7 @@ static void WriteString(const FunctionCallbackInfo<Value>& args) {
string,
const_cast<const char**>(&buf),
&len)) {
- enum encoding enc = ParseEncoding(args[3], UTF8);
+ enum encoding enc = ParseEncoding(env->isolate(), args[3], UTF8);
len = StringBytes::StorageSize(env->isolate(), string, enc);
buf = new char[len];
// StorageSize may return too large a char, so correct the actual length
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
index 697b5c4c5..5d6435101 100644
--- a/src/stream_wrap.cc
+++ b/src/stream_wrap.cc
@@ -401,7 +401,8 @@ void StreamWrap::Writev(const FunctionCallbackInfo<Value>& args) {
// String chunk
Handle<String> string = chunk->ToString();
- enum encoding encoding = ParseEncoding(chunks->Get(i * 2 + 1));
+ enum encoding encoding = ParseEncoding(env->isolate(),
+ chunks->Get(i * 2 + 1));
size_t chunk_size;
if (encoding == UTF8 && string->Length() > 65535)
chunk_size = StringBytes::Size(env->isolate(), string, encoding);
@@ -444,7 +445,8 @@ void StreamWrap::Writev(const FunctionCallbackInfo<Value>& args) {
size_t str_size = storage_size - offset;
Handle<String> string = chunk->ToString();
- enum encoding encoding = ParseEncoding(chunks->Get(i * 2 + 1));
+ enum encoding encoding = ParseEncoding(env->isolate(),
+ chunks->Get(i * 2 + 1));
str_size = StringBytes::Write(env->isolate(),
str_storage,
str_size,