From 3c086c212932c60ebfc363023849205f70a9b59a Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Sun, 30 Sep 2018 02:52:17 +0300
Subject: [PATCH] refactoring

---
 src/http.c | 8 +++++---
 src/http.h | 3 ---
 src/main.c | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/http.c b/src/http.c
index 91af65a..e0cbce5 100644
--- a/src/http.c
+++ b/src/http.c
@@ -62,14 +62,13 @@ struct http_server_t *http_server_init(struct stream_t *stream) {
 	struct http_server_runtime_t *run;
 	struct http_server_t *server;
 	struct exposed_t *exposed;
+	struct timeval refresh_interval;
 
 	A_CALLOC(exposed, 1);
 
 	A_CALLOC(run, 1);
 	run->stream = stream;
 	run->exposed = exposed;
-	run->refresh_interval.tv_sec = 0;
-	run->refresh_interval.tv_usec = 30000; // ~30 refreshes per second
 	run->drop_same_frames_blank = 10;
 
 	A_CALLOC(server, 1);
@@ -90,8 +89,11 @@ struct http_server_t *http_server_init(struct stream_t *stream) {
 	assert(!evhttp_set_cb(run->http, "/snapshot", _http_callback_snapshot, (void *)exposed));
 	assert(!evhttp_set_cb(run->http, "/stream", _http_callback_stream, (void *)server));
 
+	refresh_interval.tv_sec = 0;
+	refresh_interval.tv_usec = 30000; // ~30 refreshes per second
 	assert((run->refresh = event_new(run->base, -1, EV_PERSIST, _http_exposed_refresh, server)));
-	assert(!event_add(run->refresh, &run->refresh_interval));
+	assert(!event_add(run->refresh, &refresh_interval));
+
 	return server;
 }
 
diff --git a/src/http.h b/src/http.h
index 1ca7b4c..e093856 100644
--- a/src/http.h
+++ b/src/http.h
@@ -20,7 +20,6 @@
 
 
 #include <stdbool.h>
-#include <time.h>
 
 #include <event2/event.h>
 #include <event2/http.h>
@@ -54,8 +53,6 @@ struct http_server_runtime_t {
 	struct event			*refresh;
 	struct stream_t			*stream;
 	struct exposed_t		*exposed;
-	struct timeval			refresh_interval;
-
 	struct stream_client_t	*stream_clients;
 	unsigned				drop_same_frames_blank;
 };
diff --git a/src/main.c b/src/main.c
index c0b29a2..94720bd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -141,7 +141,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 #	define OPT_UNSIGNED(_dest, _name, _min, _max) \
 		{ errno = 0; int _tmp = strtol(optarg, NULL, 0); \
 		if (errno || _tmp < _min || _tmp > _max) \
-		{ printf("Invalid value for '%s=%u'; minimal=%u; maximum=%u\n", _name, _tmp, _min, _max); return -1; } \
+		{ printf("Invalid value for '%s=%u'; min=%u; max=%u\n", _name, _tmp, _min, _max); return -1; } \
 		_dest = _tmp; break; }
 
 #	define OPT_PARSE(_dest, _func, _invalid, _name) \