formatMessage: remove double-negation: now returns istring instead of notString

pull/34/head
legobt 2 years ago
parent a3ce012b49
commit 559731b7a7
No known key found for this signature in database
GPG Key ID: AB99C6D5F471E4E6

@ -62,18 +62,18 @@
var formatMessage = function (message) { var formatMessage = function (message) {
var type = typeof message; var type = typeof message;
if (type === 'string') { if (type === 'string') {
return [message, false]; return [message, true];
} }
if (type !== 'object' || message === null) { if (type !== 'object' || message === null) {
throw new Error(INPUT_ERROR); throw new Error(INPUT_ERROR);
} }
if (ARRAY_BUFFER && message.constructor === ArrayBuffer) { if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
return [new Uint8Array(message), true]; return [new Uint8Array(message), false];
} }
if (!isArray(message) && !isView(message)) { if (!isArray(message) && !isView(message)) {
throw new Error(INPUT_ERROR); throw new Error(INPUT_ERROR);
} }
return [message, true]; return [message, false];
} }
var empty = function (message) { var empty = function (message) {
@ -212,7 +212,7 @@
} }
var result = formatMessage(message); var result = formatMessage(message);
message = result[0]; message = result[0];
var notString = result[1]; var isString = result && result[1];
var blocks = this.blocks, byteCount = this.byteCount, length = message.length, var blocks = this.blocks, byteCount = this.byteCount, length = message.length,
blockCount = this.blockCount, index = 0, s = this.s, i, code; blockCount = this.blockCount, index = 0, s = this.s, i, code;
@ -224,7 +224,7 @@
blocks[i] = 0; blocks[i] = 0;
} }
} }
if (notString) { if (!isString) {
for (i = this.start; index < length && i < byteCount; ++index) { for (i = this.start; index < length && i < byteCount; ++index) {
blocks[i >> 2] |= message[index] << SHIFT[i++ & 3]; blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
} }
@ -288,9 +288,9 @@
Keccak.prototype.encodeString = function (str) { Keccak.prototype.encodeString = function (str) {
var result = formatMessage(str); var result = formatMessage(str);
str = result[0]; str = result[0];
var notString = result[1]; var isString = result && result[1];
var bytes = 0, length = str.length; var bytes = 0, length = str.length;
if (notString) { if (!isString) {
bytes = length; bytes = length;
} else { } else {
for (var i = 0; i < str.length; ++i) { for (var i = 0; i < str.length; ++i) {

Loading…
Cancel
Save