mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-08-06 13:37:34 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Squash more warnings

Browse Source
This commit is contained in:
cpq 2021-05-28 18:45:35 +01:00
parent 736b8ad7b7
commit 838b0bcd27
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -96,7 +96,8 @@ linux: Makefile mongoose.c mongoose.h test/unit_test.c
$(GCC) $(CC) mongoose.c test/unit_test.c $(CFLAGS) $(LDFLAGS) -o unit_test_gcc
$(GCC) ./unit_test_gcc
linux++: CC = g++ -Wno-missing-field-initializers
linux++: CC = g++
linux++: WARN += -Wno-shadow # Ignore "hides constructor for 'struct mg_str'"
linux++: linux
arm: Makefile mongoose.c mongoose.h test/unit_test.c

8
mongoose.c
View File

@ -58,7 +58,7 @@ static int mg_b64rev(int c) {
}
int mg_base64_update(unsigned char ch, char *to, int n) {
unsigned char rem = (n & 3) % 3;
int rem = (n & 3) % 3;
if (rem == 0) {
to[n] = (char) mg_b64idx(ch >> 2);
to[++n] = (char) ((ch & 3) << 4);
@ -197,7 +197,7 @@ size_t mg_dns_parse_rr(const uint8_t *buf, size_t len, size_t ofs,
if (s > e) return 0;
rr->atype = (uint16_t)(((uint16_t) s[-4] << 8) | s[-3]);
rr->aclass = (uint16_t)(((uint16_t) s[-2] << 8) | s[-1]);
if (is_question) return rr->nlen + 4;
if (is_question) return (size_t)(rr->nlen + 4);
s += 6;
if (s > e) return 0;
@ -358,7 +358,7 @@ static void mg_sendnsreq(struct mg_connection *c, struct mg_str *name, int ms,
#if MG_ENABLE_LOG
char buf[100];
#endif
d->txnid = s_reqs ? s_reqs->txnid + 1 : 1;
d->txnid = s_reqs ? (uint16_t)(s_reqs->txnid + 1) : 1;
d->next = s_reqs;
s_reqs = d;
d->expire = mg_millis() + (unsigned long) ms;
@ -1956,7 +1956,7 @@ int mg_mqtt_parse(const uint8_t *buf, size_t len, struct mg_mqtt_message *m) {
memset(m, 0, sizeof(*m));
m->dgram.ptr = (char *) buf;
if (len < 2) return MQTT_INCOMPLETE;
m->cmd = buf[0] >> 4;
m->cmd = (uint8_t)(buf[0] >> 4);
m->qos = (buf[0] >> 1) & 3;
n = len_len = 0;

2
src/base64.c
View File

@ -31,7 +31,7 @@ static int mg_b64rev(int c) {
}
int mg_base64_update(unsigned char ch, char *to, int n) {
unsigned char rem = (n & 3) % 3;
int rem = (n & 3) % 3;
if (rem == 0) {
to[n] = (char) mg_b64idx(ch >> 2);
to[++n] = (char) ((ch & 3) << 4);

4
src/dns.c
View File

@ -83,7 +83,7 @@ size_t mg_dns_parse_rr(const uint8_t *buf, size_t len, size_t ofs,
if (s > e) return 0;
rr->atype = (uint16_t)(((uint16_t) s[-4] << 8) | s[-3]);
rr->aclass = (uint16_t)(((uint16_t) s[-2] << 8) | s[-1]);
if (is_question) return rr->nlen + 4;
if (is_question) return (size_t)(rr->nlen + 4);
s += 6;
if (s > e) return 0;
@ -244,7 +244,7 @@ static void mg_sendnsreq(struct mg_connection *c, struct mg_str *name, int ms,
#if MG_ENABLE_LOG
char buf[100];
#endif
d->txnid = s_reqs ? s_reqs->txnid + 1 : 1;
d->txnid = s_reqs ? (uint16_t)(s_reqs->txnid + 1) : 1;
d->next = s_reqs;
s_reqs = d;
d->expire = mg_millis() + (unsigned long) ms;

2
src/mqtt.c
View File

@ -119,7 +119,7 @@ int mg_mqtt_parse(const uint8_t *buf, size_t len, struct mg_mqtt_message *m) {
memset(m, 0, sizeof(*m));
m->dgram.ptr = (char *) buf;
if (len < 2) return MQTT_INCOMPLETE;
m->cmd = buf[0] >> 4;
m->cmd = (uint8_t)(buf[0] >> 4);
m->qos = (buf[0] >> 1) & 3;
n = len_len = 0;