mirror of
https://github.com/ep00ch/lwip-contrib-mac.git
synced 2024-06-11 09:29:40 +00:00
httpd: don't shadow globals ('abort' is declared under linux)
This commit is contained in:
parent
cc786efa73
commit
6f002beae5
|
@ -382,7 +382,7 @@ struct http_state {
|
||||||
};
|
};
|
||||||
|
|
||||||
static err_t http_close_conn(struct tcp_pcb *pcb, struct http_state *hs);
|
static err_t http_close_conn(struct tcp_pcb *pcb, struct http_state *hs);
|
||||||
static err_t http_close_or_abort_conn(struct tcp_pcb *pcb, struct http_state *hs, u8_t abort);
|
static err_t http_close_or_abort_conn(struct tcp_pcb *pcb, struct http_state *hs, u8_t abort_conn);
|
||||||
static err_t http_find_file(struct http_state *hs, const char *uri, int is_09);
|
static err_t http_find_file(struct http_state *hs, const char *uri, int is_09);
|
||||||
static err_t http_init_file(struct http_state *hs, struct fs_file *file, int is_09, const char *uri, u8_t tag_check);
|
static err_t http_init_file(struct http_state *hs, struct fs_file *file, int is_09, const char *uri, u8_t tag_check);
|
||||||
static err_t http_poll(void *arg, struct tcp_pcb *pcb);
|
static err_t http_poll(void *arg, struct tcp_pcb *pcb);
|
||||||
|
@ -647,7 +647,7 @@ http_write(struct tcp_pcb *pcb, const void* ptr, u16_t *length, u8_t apiflags)
|
||||||
* @param hs connection state to free
|
* @param hs connection state to free
|
||||||
*/
|
*/
|
||||||
static err_t
|
static err_t
|
||||||
http_close_or_abort_conn(struct tcp_pcb *pcb, struct http_state *hs, u8_t abort)
|
http_close_or_abort_conn(struct tcp_pcb *pcb, struct http_state *hs, u8_t abort_conn)
|
||||||
{
|
{
|
||||||
err_t err;
|
err_t err;
|
||||||
LWIP_DEBUGF(HTTPD_DEBUG, ("Closing connection %p\n", (void*)pcb));
|
LWIP_DEBUGF(HTTPD_DEBUG, ("Closing connection %p\n", (void*)pcb));
|
||||||
|
@ -676,7 +676,7 @@ http_close_or_abort_conn(struct tcp_pcb *pcb, struct http_state *hs, u8_t abort)
|
||||||
http_state_free(hs);
|
http_state_free(hs);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (abort) {
|
if (abort_conn) {
|
||||||
tcp_abort(pcb);
|
tcp_abort(pcb);
|
||||||
return ERR_OK;
|
return ERR_OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user