@@ -363,7 +363,7 @@ static void restart_handler(struct mg_connection *nc, void *ev_data)
}
static void broadcast_callback(struct mg_connection *nc, int ev,
- void __attribute__ ((__unused__)) *ev_data, void __attribute__ ((__unused__)) *fn_data)
+ void __attribute__ ((__unused__)) *ev_data)
{
static uint64_t last_io_time = 0;
if (ev == MG_EV_READ) {
@@ -567,8 +567,7 @@ static void timer_ev_handler(void *fn_data)
/*
* Code common to V1 and V2
*/
-static void upload_handler(struct mg_connection *nc, int ev, void *ev_data,
- void __attribute__ ((__unused__)) *fn_data)
+static void upload_handler(struct mg_connection *nc, int ev, void *ev_data)
{
struct mg_http_multipart *mp;
struct file_upload_state *fus;
@@ -689,7 +688,7 @@ static void websocket_handler(struct mg_connection *nc, void *ev_data)
mg_ws_upgrade(nc, hm, NULL);
}
-static void ev_handler(struct mg_connection *nc, int ev, void *ev_data, void *fn_data)
+static void ev_handler(struct mg_connection *nc, int ev, void *ev_data)
{
if (nc->data[0] != 'M' && ev == MG_EV_HTTP_MSG) {
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
@@ -714,14 +713,14 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data, void *fn
} else {
nc->pfn = upload_handler;
nc->pfn_data = NULL;
- multipart_upload_handler(nc, ev, &hm, NULL);
+ multipart_upload_handler(nc, ev, &hm);
}
}
}
} else if (nc->data[0] == 'M' && (ev == MG_EV_READ || ev == MG_EV_POLL || ev == MG_EV_CLOSE)) {
if (nc->recv.len >= MG_MAX_RECV_SIZE && ev == MG_EV_READ)
nc->is_full = true;
- multipart_upload_handler(nc, ev, ev_data, fn_data);
+ multipart_upload_handler(nc, ev, ev_data);
if (nc->recv.len < MG_MAX_RECV_SIZE && ev == MG_EV_POLL)
nc->is_full = false;
#if MG_ENABLE_SSL
@@ -315,8 +315,7 @@ static void mg_http_multipart_continue(struct mg_connection *c) {
}
}
-void multipart_upload_handler(struct mg_connection *c, int ev, void *ev_data,
- void __attribute__ ((__unused__)) *fn_data)
+void multipart_upload_handler(struct mg_connection *c, int ev, void *ev_data)
{
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
struct mg_http_multipart_stream *mp_stream = c->pfn_data;
@@ -43,4 +43,4 @@ struct mg_http_multipart {
size_t len;
};
-void multipart_upload_handler(struct mg_connection *nc, int ev, void *ev_data, void *fn_data);
+void multipart_upload_handler(struct mg_connection *nc, int ev, void *ev_data);
mongoose rev-id: 5826d0e41c83170b824d73f1bee723c1be38b8b4 Signed-off-by: Michael Glembotzki <Michael.Glembotzki@iris-sensing.com> --- mongoose/mongoose_interface.c | 11 +++++------ mongoose/mongoose_multipart.c | 3 +-- mongoose/mongoose_multipart.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-)