Skip to content

Commit 2cedf05

Browse files
author
Gabriel Schulhof
committed
Replace deprecated Buffer constructor
Fixes: sebi2k1#45
1 parent 0ad5d5e commit 2cedf05

6 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎docs/files/socketcan.js.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ <h1 class="file-heading">File: socketcan.js</h1>
382382
id: m.id,
383383
ext: m.ext,
384384
rtr: false,
385-
data : (m.len &gt; 0 &amp;&amp; m.len &lt; 8) ? new Buffer(m.len) : new Buffer(8)
385+
data : (m.len &gt; 0 &amp;&amp; m.len &lt; 8) ? Buffer.alloc(m.len) : Buffer.alloc(8)
386386
};
387387

388388
canmsg.data.fill(0); // should be 0xFF for j1939 message def.

‎parse_kcd.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ exports.parseKcdFile = function(file) {
5252
'System' : node['J1939System'],
5353
'Manufacture': node['J1939ManufacturerCode'],
5454
getName : function(){
55-
var name = new Buffer(8);
55+
var name = Buffer.alloc(8);
5656
name[7] = ((this.AAC & 0x1) << 7) | ((this.Industry & 0x7) << 4) | (this.Vehicle & 0xF);
5757
name[6] = (this.System) << 1 & 0xFE;
5858
name[5] = this.Function & 0xFF;

‎socketcan.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ DatabaseService.prototype.send = function (msg_name) {
327327
id: m.id,
328328
ext: m.ext,
329329
rtr: false,
330-
data : (m.len > 0 && m.len < 8) ? new Buffer(m.len) : new Buffer(8)
330+
data : (m.len > 0 && m.len < 8) ? Buffer.alloc(m.len) : Buffer.alloc(8)
331331
};
332332

333333
canmsg.data.fill(0); // should be 0xFF for j1939 message def.

‎tests/test-raw_basic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ exports['rxtx_test'] = function(test) {
3030
c1.start();
3131
c2.start();
3232

33-
var canmsg = { id: 10, data: new Buffer([ 0, 0xFF, 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF7 ]) };
33+
var canmsg = { id: 10, data: Buffer.from([ 0, 0xFF, 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF7 ]) };
3434

3535
var rx_count = 0;
3636

‎tests/test-signal_conversion.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var signals = require('../build/Release/can_signals');
22
var buffer = require('buffer')
33

44
exports['little_endian_encode'] = function(test) {
5-
data = new Buffer([0, 0, 0, 0, 0, 0, 0, 0]);
5+
data = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]);
66

77
signals.encode_signal(data, 0, 1, true, false, 1);
88
console.log(data);
@@ -12,20 +12,20 @@ console.log(data);
1212
console.log(data);
1313
signals.encode_signal(data, 3, 1, true, false, 1);
1414
console.log(data);
15-
test.deepEqual(data, new Buffer([0x0B, 0x00, 0x00, 0, 0, 0, 0, 0]));
15+
test.deepEqual(data, Buffer.from([0x0B, 0x00, 0x00, 0, 0, 0, 0, 0]));
1616
signals.encode_signal(data, 4, 8, true, false, 0xEA);
17-
test.deepEqual(data, new Buffer([0xAB, 0x0E, 0x00, 0, 0, 0, 0, 0]));
17+
test.deepEqual(data, Buffer.from([0xAB, 0x0E, 0x00, 0, 0, 0, 0, 0]));
1818

1919
signals.encode_signal(data, 12, 12, true, false, 0xEDB);
20-
test.deepEqual(data, new Buffer([0xAB, 0xBE, 0xED, 0, 0, 0, 0, 0]));
20+
test.deepEqual(data, Buffer.from([0xAB, 0xBE, 0xED, 0, 0, 0, 0, 0]));
2121

2222
signals.encode_signal(data, 12, 12, true, false, 0);
23-
test.deepEqual(data, new Buffer([0xAB, 0x0E, 0x00, 0, 0, 0, 0, 0]), "Overwriting signal value failed");
23+
test.deepEqual(data, Buffer.from([0xAB, 0x0E, 0x00, 0, 0, 0, 0, 0]), "Overwriting signal value failed");
2424
test.done();
2525
}
2626

2727
exports['little_endian_decode'] = function(test) {
28-
data = new Buffer([0xDE, 0xAD, 0xBE, 0xEF, 0xCA, 0xFE, 0xBA, 0xBE]);
28+
data = Buffer.from([0xDE, 0xAD, 0xBE, 0xEF, 0xCA, 0xFE, 0xBA, 0xBE]);
2929

3030
test.equals(signals.decode_signal(data, 0, 8, true, false), 0xDE);
3131
test.equals(signals.decode_signal(data, 0, 12, true, false), 0xDDE);
@@ -46,56 +46,56 @@ exports['little_endian_decode'] = function(test) {
4646
}
4747

4848
exports['little_endian_signed_decode'] = function(test) {
49-
data = new Buffer([0xFE, 0xFF, 0x80]);
49+
data = Buffer.from([0xFE, 0xFF, 0x80]);
5050

5151
test.equals(signals.decode_signal(data, 8, 8, true, true), -1);
5252
test.equals(signals.decode_signal(data, 0, 16, true, true), -2);
5353
test.equals(signals.decode_signal(data, 16, 8, true, true), -128);
5454

55-
data = new Buffer([0xFF, 0xFF, 0xFF, 0xFF]);
55+
data = Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]);
5656
test.equals(signals.decode_signal(data, 0, 32, true, true), -1);
5757

5858
test.done();
5959
}
6060

6161
exports['little_endian_signed_encode'] = function(test) {
62-
data = new Buffer([0, 0, 0, 0, 0, 0, 0, 0]);
62+
data = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]);
6363

6464
signals.encode_signal(data, 0, 8, true, true, -1);
65-
test.deepEqual(data, new Buffer([0xFF, 0x00, 0x00, 0, 0, 0, 0, 0]));
65+
test.deepEqual(data, Buffer.from([0xFF, 0x00, 0x00, 0, 0, 0, 0, 0]));
6666

6767
signals.encode_signal(data, 0, 16, true, true, -2);
68-
test.deepEqual(data, new Buffer([0xFE, 0xFF, 0x00, 0, 0, 0, 0, 0]));
68+
test.deepEqual(data, Buffer.from([0xFE, 0xFF, 0x00, 0, 0, 0, 0, 0]));
6969

7070
signals.encode_signal(data, 16, 8, true, true, -128);
71-
test.deepEqual(data, new Buffer([0xFE, 0xFF, 0x80, 0, 0, 0, 0, 0]));
71+
test.deepEqual(data, Buffer.from([0xFE, 0xFF, 0x80, 0, 0, 0, 0, 0]));
7272

7373
test.done();
7474
}
7575

7676
exports['big_endian_encode'] = function(test) {
77-
data = new Buffer([0, 0, 0, 0, 0, 0, 0, 0]);
77+
data = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]);
7878

7979
signals.encode_signal(data, 0, 1, false, false, 1);
8080
signals.encode_signal(data, 1, 1, false, false, 1);
8181
signals.encode_signal(data, 2, 1, false, false, 0);
8282
signals.encode_signal(data, 3, 1, false, false, 1);
83-
test.deepEqual(data, new Buffer([0xD0, 0x00, 0x00, 0, 0, 0, 0, 0]));
83+
test.deepEqual(data, Buffer.from([0xD0, 0x00, 0x00, 0, 0, 0, 0, 0]));
8484

8585
signals.encode_signal(data, 4, 8, false, false, 0xEA);
86-
test.deepEqual(data, new Buffer([0xDE, 0xA0, 0x00, 0, 0, 0, 0, 0]));
86+
test.deepEqual(data, Buffer.from([0xDE, 0xA0, 0x00, 0, 0, 0, 0, 0]));
8787

8888
signals.encode_signal(data, 12, 12, false, false, 0xDBE);
89-
test.deepEqual(data, new Buffer([0xDE, 0xAD, 0xBE, 0, 0, 0, 0, 0]));
89+
test.deepEqual(data, Buffer.from([0xDE, 0xAD, 0xBE, 0, 0, 0, 0, 0]));
9090

9191
signals.encode_signal(data, 12, 12, false, false, 0);
92-
test.deepEqual(data, new Buffer([0xDE, 0xA0, 0x00, 0, 0, 0, 0, 0]), "Overwriting signal value failed");
92+
test.deepEqual(data, Buffer.from([0xDE, 0xA0, 0x00, 0, 0, 0, 0, 0]), "Overwriting signal value failed");
9393

9494
test.done();
9595
}
9696

9797
exports['big_endian_decode'] = function(test) {
98-
data = new Buffer([0xDE, 0xAD, 0xBE, 0xEF, 0xCA, 0xFE, 0xBA, 0xBE]);
98+
data = Buffer.from([0xDE, 0xAD, 0xBE, 0xEF, 0xCA, 0xFE, 0xBA, 0xBE]);
9999

100100
test.equals(signals.decode_signal(data, 0, 8, false, false), 0xDE);
101101
test.equals(signals.decode_signal(data, 0, 16, false, false), 0xDEAD);
@@ -112,22 +112,22 @@ exports['big_endian_decode'] = function(test) {
112112
}
113113

114114
exports['big_endian_signed_encode'] = function(test) {
115-
data = new Buffer([0, 0, 0, 0, 0, 0, 0, 0]);
115+
data = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]);
116116

117117
signals.encode_signal(data, 0, 8, false, true, -1);
118-
test.deepEqual(data, new Buffer([0xFF, 0x00, 0x00, 0, 0, 0, 0, 0]));
118+
test.deepEqual(data, Buffer.from([0xFF, 0x00, 0x00, 0, 0, 0, 0, 0]));
119119

120120
signals.encode_signal(data, 0, 16, false, true, -2);
121-
test.deepEqual(data, new Buffer([0xFF, 0xFE, 0x00, 0, 0, 0, 0, 0]));
121+
test.deepEqual(data, Buffer.from([0xFF, 0xFE, 0x00, 0, 0, 0, 0, 0]));
122122

123123
signals.encode_signal(data, 16, 8, false, true, -128);
124-
test.deepEqual(data, new Buffer([0xFF, 0xFE, 0x80, 0, 0, 0, 0, 0]));
124+
test.deepEqual(data, Buffer.from([0xFF, 0xFE, 0x80, 0, 0, 0, 0, 0]));
125125

126126
test.done();
127127
}
128128

129129
exports['big_endian_signed_decode'] = function(test) {
130-
data = new Buffer([0xFF, 0xFE, 0x80 ]);
130+
data = Buffer.from([0xFF, 0xFE, 0x80 ]);
131131

132132
test.equals(signals.decode_signal(data, 0, 8, false, true), -1);
133133
test.equals(signals.decode_signal(data, 0, 16, false, true), -2);

‎tests/test-signal_generation.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ exports['receive_signals'] = function(test) {
1212
channel.start();
1313
gen_channel.start();
1414

15-
var cm = { data: new Buffer([ 0 ]) };
15+
var cm = { data: Buffer.from([ 0 ]) };
1616
cm.id = db.messages["CruiseControlStatus"].id;
1717

1818
var next_speed = 255;
@@ -57,7 +57,7 @@ exports['receive_update_signals'] = function(test) {
5757
channel.start();
5858
gen_channel.start();
5959

60-
var cm = { data: new Buffer([ 0 ]) };
60+
var cm = { data: Buffer.from([ 0 ]) };
6161
cm.id = db.messages["CruiseControlStatus"].id;
6262

6363
var next_speed = 255;

0 commit comments

Comments
 (0)