Browse Source

Remove callback argument to FileWriteStream.prototype.write

v0.7.4-release
Ryan Dahl 15 years ago
parent
commit
f618551694
  1. 5
      doc/api.markdown
  2. 9
      lib/fs.js
  3. 6
      test/simple/test-file-write-stream.js

5
doc/api.markdown

@ -1509,14 +1509,13 @@ Returns a new FileWriteStream object.
A boolean that is `true` by default, but turns `false` after an `'error'`
occurred or `end()` / `destroy()` was called.
### writeStream.write(data)
### writeStream.write(data, encoding='utf8')
Returns `true` if the data was flushed to the kernel, and `false` if it was
queued up for being written later. A `'drain'` will fire after all queued data
has been written.
You can also specify `callback` to be notified when the data from this write
has been flushed. The first param is `err`, the second is `bytesWritten`.
The second optional parameter specifies the encoding of for the string.
### writeStream.end()

9
lib/fs.js

@ -655,8 +655,7 @@ FileWriteStream.prototype.flush = function () {
this.busy = true;
var
method = args.shift(),
var method = args.shift(),
cb = args.pop();
var self = this;
@ -703,12 +702,14 @@ FileWriteStream.prototype.flush = function () {
};
FileWriteStream.prototype.write = function(data, cb) {
FileWriteStream.prototype.write = function(data, encoding) {
if (!this.writeable) {
throw new Error('stream not writeable');
}
this._queue.push([fs.write, data, undefined, this.encoding, cb]);
// TODO handle Buffer
this._queue.push([fs.write, data, undefined, encoding || 'utf8', null]);
this.flush();
return false;

6
test/simple/test-file-write-stream.js

@ -13,7 +13,6 @@ var
drain: -2,
close: -1,
endCb: -1,
write: -11,
};
file
@ -48,10 +47,7 @@ file
for (var i = 0; i < 11; i++) {
(function(i) {
assert.strictEqual(false, file.write(i, function(err, bytesWritten) {
callbacks.write++;
assert.equal(new String(i).length, bytesWritten);
}));
assert.strictEqual(false, file.write(i));
})(i);
}

Loading…
Cancel
Save