Skip to content

Commit

Permalink
Merge pull request #2306 from cesanta/nits
Browse files Browse the repository at this point in the history 
Nits
  • Loading branch information
@cpq
cpq authored Jul 19, 2023
2 parents 387a602 + 3c9e218 commit ee80822
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 24 deletions.
23 changes: 11 additions & 12 deletions mongoose.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3074,7 +3074,7 @@ static void mg_send_u32(struct mg_connection *c, uint32_t value) {
mg_send(c, &value, sizeof(value));
}

static uint8_t compute_variable_length_size(size_t length) {
static uint8_t varint_size(size_t length) {
uint8_t bytes_needed = 0;
do {
bytes_needed++;
Expand All @@ -3083,8 +3083,8 @@ static uint8_t compute_variable_length_size(size_t length) {
return bytes_needed;
}

static int encode_variable_length(uint8_t *buf, size_t value) {
int len = 0;
static size_t encode_varint(uint8_t *buf, size_t value) {
size_t len = 0;

do {
uint8_t byte = (uint8_t) (value % 128);
Expand All @@ -3097,16 +3097,15 @@ static int encode_variable_length(uint8_t *buf, size_t value) {
}

static size_t decode_varint(const uint8_t *buf, size_t len, size_t *value) {
uint32_t multiplier = 1;
size_t offset;
size_t multiplier = 1, offset;
*value = 0;

for (offset = 0; offset < 4 && offset < len; offset++) {
uint8_t encoded_byte = buf[offset];
*value += (encoded_byte & 0x7F) * multiplier;
*value += (encoded_byte & 0x7f) * multiplier;
multiplier *= 128;

if (!(encoded_byte & 0x80)) return offset + 1;
if ((encoded_byte & 0x80) == 0) return offset + 1;
}

return 0;
Expand Down Expand Up @@ -3138,7 +3137,7 @@ static size_t get_properties_length(struct mg_mqtt_prop *props, size_t count) {
size += (uint32_t) (props[i].val.len + sizeof(uint16_t));
break;
case MQTT_PROP_TYPE_VARIABLE_INT:
size += compute_variable_length_size((uint32_t) props[i].iv);
size += varint_size((uint32_t) props[i].iv);
break;
case MQTT_PROP_TYPE_INT:
size += (uint32_t) sizeof(uint32_t);
Expand All @@ -3161,7 +3160,7 @@ static size_t get_properties_length(struct mg_mqtt_prop *props, size_t count) {
// size of the variable length of the content
static size_t get_props_size(struct mg_mqtt_prop *props, size_t count) {
size_t size = get_properties_length(props, count);
size += compute_variable_length_size(size);
size += varint_size(size);
return size;
}

Expand All @@ -3170,10 +3169,10 @@ static void mg_send_mqtt_properties(struct mg_connection *c,
size_t total_size = get_properties_length(props, nprops);
uint8_t buf_v[4] = {0, 0, 0, 0};
uint8_t buf[4] = {0, 0, 0, 0};
int i, len = encode_variable_length(buf, total_size);
size_t i, len = encode_varint(buf, total_size);

mg_send(c, buf, (size_t) len);
for (i = 0; i < (int) nprops; i++) {
for (i = 0; i < nprops; i++) {
mg_send(c, &props[i].id, sizeof(props[i].id));
switch (mqtt_prop_type_by_id(props[i].id)) {
case MQTT_PROP_TYPE_STRING_PAIR:
Expand All @@ -3200,7 +3199,7 @@ static void mg_send_mqtt_properties(struct mg_connection *c,
mg_send(c, props[i].val.ptr, props[i].val.len);
break;
case MQTT_PROP_TYPE_VARIABLE_INT:
len = encode_variable_length(buf_v, props[i].iv);
len = encode_varint(buf_v, props[i].iv);
mg_send(c, buf_v, (size_t) len);
break;
}
Expand Down
23 changes: 11 additions & 12 deletions src/mqtt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static void mg_send_u32(struct mg_connection *c, uint32_t value) {
mg_send(c, &value, sizeof(value));
}

static uint8_t compute_variable_length_size(size_t length) {
static uint8_t varint_size(size_t length) {
uint8_t bytes_needed = 0;
do {
bytes_needed++;
Expand All @@ -76,8 +76,8 @@ static uint8_t compute_variable_length_size(size_t length) {
return bytes_needed;
}

static int encode_variable_length(uint8_t *buf, size_t value) {
int len = 0;
static size_t encode_varint(uint8_t *buf, size_t value) {
size_t len = 0;

do {
uint8_t byte = (uint8_t) (value % 128);
Expand All @@ -90,16 +90,15 @@ static int encode_variable_length(uint8_t *buf, size_t value) {
}

static size_t decode_varint(const uint8_t *buf, size_t len, size_t *value) {
uint32_t multiplier = 1;
size_t offset;
size_t multiplier = 1, offset;
*value = 0;

for (offset = 0; offset < 4 && offset < len; offset++) {
uint8_t encoded_byte = buf[offset];
*value += (encoded_byte & 0x7F) * multiplier;
*value += (encoded_byte & 0x7f) * multiplier;
multiplier *= 128;

if (!(encoded_byte & 0x80)) return offset + 1;
if ((encoded_byte & 0x80) == 0) return offset + 1;
}

return 0;
Expand Down Expand Up @@ -131,7 +130,7 @@ static size_t get_properties_length(struct mg_mqtt_prop *props, size_t count) {
size += (uint32_t) (props[i].val.len + sizeof(uint16_t));
break;
case MQTT_PROP_TYPE_VARIABLE_INT:
size += compute_variable_length_size((uint32_t) props[i].iv);
size += varint_size((uint32_t) props[i].iv);
break;
case MQTT_PROP_TYPE_INT:
size += (uint32_t) sizeof(uint32_t);
Expand All @@ -154,7 +153,7 @@ static size_t get_properties_length(struct mg_mqtt_prop *props, size_t count) {
// size of the variable length of the content
static size_t get_props_size(struct mg_mqtt_prop *props, size_t count) {
size_t size = get_properties_length(props, count);
size += compute_variable_length_size(size);
size += varint_size(size);
return size;
}

Expand All @@ -163,10 +162,10 @@ static void mg_send_mqtt_properties(struct mg_connection *c,
size_t total_size = get_properties_length(props, nprops);
uint8_t buf_v[4] = {0, 0, 0, 0};
uint8_t buf[4] = {0, 0, 0, 0};
int i, len = encode_variable_length(buf, total_size);
size_t i, len = encode_varint(buf, total_size);

mg_send(c, buf, (size_t) len);
for (i = 0; i < (int) nprops; i++) {
for (i = 0; i < nprops; i++) {
mg_send(c, &props[i].id, sizeof(props[i].id));
switch (mqtt_prop_type_by_id(props[i].id)) {
case MQTT_PROP_TYPE_STRING_PAIR:
Expand All @@ -193,7 +192,7 @@ static void mg_send_mqtt_properties(struct mg_connection *c,
mg_send(c, props[i].val.ptr, props[i].val.len);
break;
case MQTT_PROP_TYPE_VARIABLE_INT:
len = encode_variable_length(buf_v, props[i].iv);
len = encode_varint(buf_v, props[i].iv);
mg_send(c, buf_v, (size_t) len);
break;
}
Expand Down

0 comments on commit ee80822

Please sign in to comment.