From a22cba0015322ab89ae1d51a66d8691ac60df566 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Fri, 21 Sep 2018 06:16:30 +0300 Subject: [PATCH] refactoring --- src/http.c | 10 ++++------ src/stream.c | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/http.c b/src/http.c index 413d369..dcac89f 100644 --- a/src/http.c +++ b/src/http.c @@ -270,7 +270,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c RN "--" BOUNDARY RN )); - assert(!bufferevent_write_buffer(buf_event, buf)); // FIXME + assert(!bufferevent_write_buffer(buf_event, buf)); client->need_initial = false; } @@ -289,7 +289,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c )); assert(evbuffer_add_printf(buf, RN "--" BOUNDARY RN)); - assert(!bufferevent_write_buffer(buf_event, buf)); // FIXME + assert(!bufferevent_write_buffer(buf_event, buf)); evbuffer_free(buf); bufferevent_setcb(buf_event, NULL, NULL, _http_callback_stream_error, (void *)client); @@ -370,8 +370,7 @@ void _expose_new_picture(struct http_server_t *server) { } memcpy( - server->run->exposed->picture.data, - server->run->stream->picture.data, + server->run->exposed->picture.data, server->run->stream->picture.data, server->run->stream->picture.size * sizeof(*server->run->exposed->picture.data) ); @@ -389,8 +388,7 @@ void _expose_blank_picture(struct http_server_t *server) { } memcpy( - server->run->exposed->picture.data, - BLANK_JPG_DATA, + server->run->exposed->picture.data, BLANK_JPG_DATA, BLANK_JPG_SIZE * sizeof(*server->run->exposed->picture.data) ); diff --git a/src/stream.c b/src/stream.c index 04c36c9..79d0a44 100644 --- a/src/stream.c +++ b/src/stream.c @@ -129,8 +129,7 @@ void stream_loop(struct stream_t *stream) { stream->picture.size = stream->dev->run->pictures[oldest_worker->ctx.index].size; stream->picture.allocated = stream->dev->run->pictures[oldest_worker->ctx.index].allocated; memcpy( - stream->picture.data, - stream->dev->run->pictures[oldest_worker->ctx.index].data, + stream->picture.data, stream->dev->run->pictures[oldest_worker->ctx.index].data, stream->picture.size * sizeof(*stream->picture.data) );