wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 754777 - B2G RIL: Add a Helper to read String delimiters. r=philikon

Browse Source
This commit is contained in:
Yoshi Huang 2012-05-14 14:45:13 +08:00
parent 595dd855f5
commit eacacc31ed
1 changed files with 26 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
dom/system/gonk/ril_worker.js
View File

@ -299,15 +299,7 @@ let Buf = {
// Strings are \0\0 delimited, but that isn't part of the length. And
// if the string length is even, the delimiter is two characters wide.
// It's insane, I know.
let delimiter = this.readUint16();
if (!(string_len & 1)) {
delimiter |= this.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
this.readStringDelimiter(string_len);
return s;
},
@ -319,6 +311,18 @@ let Buf = {
}
return strings;
},
readStringDelimiter: function readStringDelimiter(length) {
let delimiter = this.readUint16();
if (!(length & 1)) {
delimiter |= this.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
},
readParcelSize: function readParcelSize() {
return this.readUint8Unchecked() << 24 |
@ -363,10 +367,7 @@ let Buf = {
// Strings are \0\0 delimited, but that isn't part of the length. And
// if the string length is even, the delimiter is two characters wide.
// It's insane, I know.
this.writeUint16(0);
if (!(value.length & 1)) {
this.writeUint16(0);
}
this.writeStringDelimiter(value.length);
},
writeStringList: function writeStringList(strings) {
@ -375,6 +376,13 @@ let Buf = {
this.writeString(strings[i]);
}
},
writeStringDelimiter: function writeStringDelimiter(length) {
this.writeUint16(0);
if (!(length & 1)) {
this.writeUint16(0);
}
},
writeParcelSize: function writeParcelSize(value) {
/**
@ -904,15 +912,7 @@ let RIL = {
return;
}
this.iccInfo.MSISDN = GsmPDUHelper.readAddress(len);
let delimiter = Buf.readUint16();
if (!(length & 1)) {
delimiter |= Buf.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
Buf.readStringDelimiter(length);
if (DEBUG) debug("MSISDN: " + this.iccInfo.MSISDN);
if (this.iccInfo.MSISDN) {
@ -943,15 +943,7 @@ let RIL = {
// Each octet is encoded into two chars.
let len = length / 2;
this.iccInfo.AD = GsmPDUHelper.readHexOctetArray(len);
let delimiter = Buf.readUint16();
if (!(length & 1)) {
delimiter |= Buf.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
Buf.readStringDelimiter(length);
if (DEBUG) {
let str = "";
@ -1010,15 +1002,7 @@ let RIL = {
// Each octet is encoded into two chars.
let len = length / 2;
this.iccInfo.UST = GsmPDUHelper.readHexOctetArray(len);
let delimiter = Buf.readUint16();
if (!(length & 1)) {
delimiter |= Buf.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
Buf.readStringDelimiter(length);
if (DEBUG) {
let str = "";
@ -1610,15 +1594,7 @@ let RIL = {
// Length of a record, data[14]
let recordSize = GsmPDUHelper.readHexOctet();
let delimiter = Buf.readUint16();
if (!(length & 1)) {
delimiter |= Buf.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
Buf.readStringDelimiter(length);
switch (options.type) {
case EF_TYPE_LINEAR_FIXED:
@ -1916,15 +1892,7 @@ let RIL = {
if (DEBUG) debug(message);
// Read string delimiters. See Buf.readString().
let delimiter = Buf.readUint16();
if (!(messageStringLength & 1)) {
delimiter |= Buf.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
Buf.readStringDelimiter(length);
return message;
},
@ -3061,26 +3029,6 @@ let GsmPDUHelper = {
return number;
},
/**
* Read a string from Buf and convert it to BCD
*
* @return the decimal as a number.
*/
readStringAsBCD: function readStringAsBCD() {
let length = Buf.readUint32();
let bcd = this.readSwappedNibbleBCD(length / 2);
let delimiter = Buf.readUint16();
if (!(length & 1)) {
delimiter |= Buf.readUint16();
}
if (DEBUG) {
if (delimiter != 0) {
debug("Something's wrong, found string delimiter: " + delimiter);
}
}
return bcd;
},
/**
* Write numerical data as swapped nibble BCD.
*