uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up config_state.c and fix readString

Browse Source
This commit is contained in:
Eric Tang
2017-07-09 17:36:51 -07:00
parent 282c77c850
commit 8eb6bdeb35
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
right/src/config/config_state.c
View File

@@ -8,27 +8,27 @@ uint8_t readUInt8(serialized_buffer_t *buffer) {
}
uint16_t readUInt16(serialized_buffer_t *buffer) {
uint8_t firstByte = buffer->buffer[buffer->offset++];
return firstByte + (buffer->buffer[buffer->offset++] << 8);
uint16_t uInt16 = *(uint16_t *)(buffer->buffer + buffer->offset);
buffer->offset += 2;
return uInt16;
}
bool readBool(serialized_buffer_t *buffer) {
return buffer->buffer[buffer->offset++] == 1;
return readUInt8(buffer);
}
uint16_t readCompactLength(serialized_buffer_t *buffer) {
uint16_t length = readUInt8(buffer);
if (length == 0xFF) {
length = readUInt16(buffer);
}
return length;
uint16_t compactLength = readUInt8(buffer);
return compactLength == 0xFF ? readUInt16(buffer) : compactLength;
}
const char *readString(serialized_buffer_t *buffer, uint16_t *len) {
const char *str = (const char *)&(buffer->buffer[buffer->offset]);
const char *string;
*len = readCompactLength(buffer);
string = buffer->buffer + buffer->offset;
buffer->offset += *len;
return str;
return string;
}