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

Squash warnings

Browse Source
This commit is contained in:
Sergey Lyubka 2022-01-05 13:57:30 +00:00
parent 8ebb3bc37b
commit ff811f287a
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mongoose.c
View File

@ -2390,7 +2390,7 @@ char *mg_straddr(struct mg_connection *c, char *buf, size_t len) {
char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len) { char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len) {
if (addr->is_ip6) { if (addr->is_ip6) {
uint16_t *p = (uint16_t *) addr->ip6; uint16_t *p = (uint16_t *) addr->ip6;
snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", mg_htons(p[0]), snprintf(buf, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", mg_htons(p[0]),
mg_htons(p[1]), mg_htons(p[2]), mg_htons(p[3]), mg_htons(p[4]), mg_htons(p[1]), mg_htons(p[2]), mg_htons(p[3]), mg_htons(p[4]),
mg_htons(p[5]), mg_htons(p[6]), mg_htons(p[7])); mg_htons(p[5]), mg_htons(p[6]), mg_htons(p[7]));
} else { } else {
@ -2988,6 +2988,7 @@ static void iolog(struct mg_connection *c, char *buf, long n, bool r) {
mg_addr_to_str(&a, t1, sizeof(t1)), r ? "<-" : "->", mg_addr_to_str(&a, t1, sizeof(t1)), r ? "<-" : "->",
mg_addr_to_str(&c->peer, t2, sizeof(t2)), c->label, n, s)); mg_addr_to_str(&c->peer, t2, sizeof(t2)), c->label, n, s));
free(s); free(s);
(void) t1, (void) t2; // Silence warnings for MG_ENABLE_LOG=0
} }
if (r) { if (r) {
struct mg_str evd = mg_str_n(buf, (size_t) n); struct mg_str evd = mg_str_n(buf, (size_t) n);

1
mongoose.h
View File

@ -861,6 +861,7 @@ bool mg_send(struct mg_connection *, const void *, size_t);
int mg_printf(struct mg_connection *, const char *fmt, ...); int mg_printf(struct mg_connection *, const char *fmt, ...);
int mg_vprintf(struct mg_connection *, const char *fmt, va_list ap); int mg_vprintf(struct mg_connection *, const char *fmt, va_list ap);
char *mg_straddr(struct mg_connection *, char *, size_t); char *mg_straddr(struct mg_connection *, char *, size_t);
char *mg_addr_to_str(struct mg_addr *, char *, size_t);
bool mg_aton(struct mg_str str, struct mg_addr *addr); bool mg_aton(struct mg_str str, struct mg_addr *addr);
char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len); char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len);

2
src/net.c
View File

@ -34,7 +34,7 @@ char *mg_straddr(struct mg_connection *c, char *buf, size_t len) {
char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len) { char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len) {
if (addr->is_ip6) { if (addr->is_ip6) {
uint16_t *p = (uint16_t *) addr->ip6; uint16_t *p = (uint16_t *) addr->ip6;
snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", mg_htons(p[0]), snprintf(buf, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", mg_htons(p[0]),
mg_htons(p[1]), mg_htons(p[2]), mg_htons(p[3]), mg_htons(p[4]), mg_htons(p[1]), mg_htons(p[2]), mg_htons(p[3]), mg_htons(p[4]),
mg_htons(p[5]), mg_htons(p[6]), mg_htons(p[7])); mg_htons(p[5]), mg_htons(p[6]), mg_htons(p[7]));
} else { } else {

1
src/sock.c
View File

@ -125,6 +125,7 @@ static void iolog(struct mg_connection *c, char *buf, long n, bool r) {
mg_addr_to_str(&a, t1, sizeof(t1)), r ? "<-" : "->", mg_addr_to_str(&a, t1, sizeof(t1)), r ? "<-" : "->",
mg_addr_to_str(&c->peer, t2, sizeof(t2)), c->label, n, s)); mg_addr_to_str(&c->peer, t2, sizeof(t2)), c->label, n, s));
free(s); free(s);
(void) t1, (void) t2; // Silence warnings for MG_ENABLE_LOG=0
} }
if (r) { if (r) {
struct mg_str evd = mg_str_n(buf, (size_t) n); struct mg_str evd = mg_str_n(buf, (size_t) n);

1
test/unit_test.c
View File

@ -1514,7 +1514,6 @@ static void test_udp(void) {
ASSERT(done == 111); ASSERT(done == 111);
mg_mgr_free(&mgr); mg_mgr_free(&mgr);
ASSERT(mgr.conns == NULL); ASSERT(mgr.conns == NULL);
exit(0);
} }
static void test_check_ip_acl(void) { static void test_check_ip_acl(void) {