Skip to content

Commit bf86e84

Browse files
committed
Remove buffers noAssert argument
Support for the `noAssert` argument dropped in the upcoming Node.js v.10. This removes the argument to make sure everything works as it should. Refs: nodejs/node#18395
1 parent 145f412 commit bf86e84

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

i16.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ I16RW.prototype.min = -0x7fff - 1;
3737
I16RW.prototype.max = 0x7fff;
3838

3939
I16RW.prototype.poolReadFrom = function poolReadFrom(result, buffer, offset) {
40-
var value = buffer.readInt16BE(offset, true);
40+
var value = buffer.readInt16BE(offset);
4141
return result.reset(null, offset + this.width, value);
4242
};
4343

@@ -63,7 +63,7 @@ I16RW.prototype.poolWriteInto = function poolWriteInto(result, value, buffer, of
6363
}));
6464
}
6565

66-
buffer.writeInt16BE(coerced, offset, true);
66+
buffer.writeInt16BE(coerced, offset);
6767
return result.reset(null, offset + this.width);
6868
};
6969

i32.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ I32RW.prototype.min = -0x7fffffff - 1;
3737
I32RW.prototype.max = 0x7fffffff;
3838

3939
I32RW.prototype.poolReadFrom = function poolReadFrom(result, buffer, offset) {
40-
var value = buffer.readInt32BE(offset, true);
40+
var value = buffer.readInt32BE(offset);
4141
return result.reset(null, offset + this.width, value);
4242
};
4343

@@ -63,7 +63,7 @@ I32RW.prototype.poolWriteInto = function poolWriteInto(result, value, buffer, of
6363
}));
6464
}
6565

66-
buffer.writeInt32BE(coerced, offset, true);
66+
buffer.writeInt32BE(coerced, offset);
6767
return result.reset(null, offset + this.width);
6868
};
6969

i64.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ I64RW.prototype.poolWriteInto = function poolWriteInto(destResult, value, buffer
4646
return this.writeBufferInt64Into(destResult, value, buffer, offset);
4747
} else if (typeof value === 'number') {
4848
var number = Long.fromNumber(value);
49-
buffer.writeInt32BE(number.high, offset, true);
50-
buffer.writeInt32BE(number.low, offset + 4, true);
49+
buffer.writeInt32BE(number.high, offset);
50+
buffer.writeInt32BE(number.low, offset + 4);
5151
return destResult.reset(null, offset + 8);
5252
} else if (Array.isArray(value)) {
5353
return this.writeArrayInt64Into(destResult, value, buffer, offset);
@@ -76,8 +76,8 @@ function writeObjectInt64Into(destResult, value, buffer, offset) {
7676
'{hi[gh], lo[w]} with low bits, or other i64 representation'), null);
7777
}
7878
// Does not validate range of hi or lo value
79-
buffer.writeInt32BE(value.high || value.hi, offset, true);
80-
buffer.writeInt32BE(value.low || value.lo, offset + 4, true);
79+
buffer.writeInt32BE(value.high || value.hi, offset);
80+
buffer.writeInt32BE(value.low || value.lo, offset + 4);
8181
return destResult.reset(null, offset + 8);
8282
};
8383

@@ -124,8 +124,8 @@ util.inherits(I64LongRW, I64RW);
124124

125125
I64LongRW.prototype.poolReadFrom = function poolReadFrom(destResult, buffer, offset) {
126126
var value = Long.fromBits(
127-
buffer.readInt32BE(offset + 4, 4, true),
128-
buffer.readInt32BE(offset, 4, true)
127+
buffer.readInt32BE(offset + 4, 4),
128+
buffer.readInt32BE(offset, 4)
129129
);
130130
return destResult.reset(null, offset + 8, value);
131131
};
@@ -138,8 +138,8 @@ util.inherits(I64DateRW, I64RW);
138138

139139
I64DateRW.prototype.poolReadFrom = function poolReadFrom(destResult, buffer, offset) {
140140
var long = Long.fromBits(
141-
buffer.readInt32BE(offset + 4, 4, true),
142-
buffer.readInt32BE(offset + 0, 4, true)
141+
buffer.readInt32BE(offset + 4, 4),
142+
buffer.readInt32BE(offset + 0, 4)
143143
);
144144
var ms = long.toNumber();
145145
var value = new Date(ms);

message.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ MessageRW.prototype.poolLegacyWriteInto = function poolLegacyWriteInto(result, m
194194
// name~4 type:1 id:4
195195

196196
// name.length:4
197-
buffer.writeUInt32BE(message.name.length, offset, true);
197+
buffer.writeUInt32BE(message.name.length, offset);
198198
offset += 4;
199199

200200
// name:name.length
@@ -212,14 +212,14 @@ MessageRW.prototype.poolLegacyWriteInto = function poolLegacyWriteInto(result, m
212212
offset += 1;
213213

214214
// id:4
215-
buffer.writeUInt32BE(message.id, offset, true);
215+
buffer.writeUInt32BE(message.id, offset);
216216
offset += 4;
217217

218218
return result.reset(null, offset);
219219
};
220220

221221
MessageRW.prototype.poolReadFrom = function poolReadFrom(result, buffer, offset) {
222-
var msb = buffer.readInt8(offset, true);
222+
var msb = buffer.readInt8(offset);
223223
if (msb < 0) {
224224
result = this.poolStrictReadFrom(result, buffer, offset);
225225
} else {
@@ -260,7 +260,7 @@ MessageRW.prototype.poolStrictReadFrom = function poolStrictReadFrom(result, buf
260260
// version:2 type:2 name~4 id:4
261261

262262
var message = new Message();
263-
message.version = buffer.readUInt16BE(offset, true) & ~0x8000; // mask out MSB
263+
message.version = buffer.readUInt16BE(offset) & ~0x8000; // mask out MSB
264264
offset += 2;
265265

266266
if (message.version !== 1) {
@@ -270,7 +270,7 @@ MessageRW.prototype.poolStrictReadFrom = function poolStrictReadFrom(result, buf
270270
}
271271

272272
// type:2
273-
var type = buffer.readUInt16BE(offset, true) & 0xFF;
273+
var type = buffer.readUInt16BE(offset) & 0xFF;
274274
offset += 2;
275275

276276
message.type = typeNames[type];
@@ -281,15 +281,15 @@ MessageRW.prototype.poolStrictReadFrom = function poolStrictReadFrom(result, buf
281281
}
282282

283283
// name.length:4
284-
var length = buffer.readUInt32BE(offset, true);
284+
var length = buffer.readUInt32BE(offset);
285285
offset += 4;
286286

287287
// name:name.length
288288
message.name = buffer.toString('ascii', offset, offset + length, true);
289289
offset += length;
290290

291291
// id:4
292-
message.id = buffer.readUInt32BE(offset, true);
292+
message.id = buffer.readUInt32BE(offset);
293293
offset += 4;
294294

295295
return result.reset(null, offset, message);
@@ -300,19 +300,19 @@ MessageRW.prototype.poolLegacyReadFrom = function poolLegacyReadFrom(result, buf
300300
var message = new Message();
301301

302302
// name.length
303-
var length = buffer.readUInt32BE(offset, true);
303+
var length = buffer.readUInt32BE(offset);
304304
offset += 4;
305305

306306
// name:name.length
307307
message.name = buffer.toString('ascii', offset, offset + length, true);
308308
offset += length;
309309

310310
// type:2
311-
var type = buffer.readUInt8(offset, true);
311+
var type = buffer.readUInt8(offset);
312312
offset += 1;
313313

314314
// id:4
315-
message.id = buffer.readUInt32BE(offset, true);
315+
message.id = buffer.readUInt32BE(offset);
316316
offset += 4;
317317

318318
message.type = typeNames[type];

skip.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function skipField(destResult, buffer, offset) {
5656
}), offset);
5757
}
5858

59-
var typeid = buffer.readInt8(offset, true);
59+
var typeid = buffer.readInt8(offset);
6060
offset += 1;
6161

6262
return skipType(destResult, buffer, offset, typeid);
@@ -109,7 +109,7 @@ function skipStruct(destResult, buffer, offset) {
109109
offset: offset
110110
}), offset);
111111
}
112-
var typeid = buffer.readInt8(offset, true);
112+
var typeid = buffer.readInt8(offset);
113113
offset += 1;
114114

115115
if (typeid === TYPE.STOP) {
@@ -149,7 +149,7 @@ function skipString(destResult, buffer, offset) {
149149
}), offset);
150150
}
151151

152-
var length = buffer.readInt32BE(offset, true);
152+
var length = buffer.readInt32BE(offset);
153153
offset += 4;
154154

155155
// istanbul ignore if

0 commit comments

Comments
 (0)