better names for byteArray / bigByteArray

This commit is contained in:
Andrew Kelley 2013-01-03 21:02:44 -05:00
parent fadb9e0c0a
commit cc3480ee91
2 changed files with 16 additions and 16 deletions

View file

@ -197,7 +197,7 @@ var writers = {
'byte': ByteWriter, 'byte': ByteWriter,
'ubyte': UByteWriter, 'ubyte': UByteWriter,
'string': StringWriter, 'string': StringWriter,
'byteArray': ByteArrayWriter, 'byteArray16': ByteArray16Writer,
'bool': BoolWriter, 'bool': BoolWriter,
'double': DoubleWriter, 'double': DoubleWriter,
'float': FloatWriter, 'float': FloatWriter,
@ -207,8 +207,8 @@ var writers = {
var readers = { var readers = {
'string': readString, 'string': readString,
'ascii': readAscii, 'ascii': readAscii,
'byteArray': readByteArray, 'byteArray16': readByteArray16,
'bigByteArray': readBigByteArray, 'byteArray32': readByteArray32,
'short': readShort, 'short': readShort,
'ushort': readUShort, 'ushort': readUShort,
'int': readInt, 'int': readInt,
@ -439,7 +439,7 @@ function readString (buffer, offset) {
}; };
} }
function readByteArray (buffer, offset) { function readByteArray16 (buffer, offset) {
var results = readShort(buffer, offset); var results = readShort(buffer, offset);
if (! results) return null; if (! results) return null;
@ -455,7 +455,7 @@ function readByteArray (buffer, offset) {
}; };
} }
function readBigByteArray(buffer, offset) { function readByteArray32(buffer, offset) {
var results = readInt(buffer, offset); var results = readInt(buffer, offset);
if (! results) return null; if (! results) return null;
@ -632,13 +632,13 @@ StringWriter.prototype.write = function(buffer, offset) {
this.encoded.copy(buffer, offset + 2); this.encoded.copy(buffer, offset + 2);
}; };
function ByteArrayWriter(value) { function ByteArray16Writer(value) {
assert.ok(Buffer.isBuffer(value), "non buffer passed to ByteArrayWriter"); assert.ok(Buffer.isBuffer(value), "non buffer passed to ByteArray16Writer");
this.value = value; this.value = value;
this.size = 2 + value.length; this.size = 2 + value.length;
} }
ByteArrayWriter.prototype.write = function(buffer, offset) { ByteArray16Writer.prototype.write = function(buffer, offset) {
buffer.writeInt16BE(this.value.length, offset); buffer.writeInt16BE(this.value.length, offset);
this.value.copy(buffer, offset + 2); this.value.copy(buffer, offset + 2);
}; };

View file

@ -726,7 +726,7 @@ module.exports = {
}, },
{ {
name: "compressedData", name: "compressedData",
type: "bigByteArray" type: "byteArray32"
} }
], ],
0x34: [ 0x34: [
@ -744,7 +744,7 @@ module.exports = {
}, },
{ {
name: "data", name: "data",
type: "bigByteArray" type: "byteArray32"
} }
], ],
0x35: [ 0x35: [
@ -1126,7 +1126,7 @@ module.exports = {
}, },
{ {
name: "nbtData", name: "nbtData",
type: "byteArray" type: "byteArray16"
} }
], ],
0xc8: [ 0xc8: [
@ -1208,17 +1208,17 @@ module.exports = {
}, },
{ {
name: "data", name: "data",
type: "byteArray" type: "byteArray16"
} }
], ],
0xfc: [ 0xfc: [
{ {
name: "sharedSecret", name: "sharedSecret",
type: "byteArray" type: "byteArray16"
}, },
{ {
name: "verifyToken", name: "verifyToken",
type: "byteArray" type: "byteArray16"
} }
], ],
0xfd: [ 0xfd: [
@ -1228,11 +1228,11 @@ module.exports = {
}, },
{ {
name: "publicKey", name: "publicKey",
type: "byteArray" type: "byteArray16"
}, },
{ {
name: "verifyToken", name: "verifyToken",
type: "byteArray" type: "byteArray16"
} }
], ],
0xfe: [ 0xfe: [