From 17ec167dd9537f7257080fb893eeacf1294a0832 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 2 Sep 2022 22:02:41 +0200
Subject: [PATCH] Move part of `http/` into `util/http/`

---
 cmd/camera-streamer/http.c         | 2 +-
 cmd/camera-streamer/main.c         | 2 +-
 cmd/camera-streamer/opts.c         | 2 +-
 device/camera/camera_isp.c         | 2 +-
 device/camera/camera_output.c      | 2 +-
 http/http_ffmpeg.c                 | 2 +-
 http/http_h264.c                   | 2 +-
 http/http_jpeg.c                   | 2 +-
 rtsp/rtsp.cc                       | 2 +-
 {http => util/http}/http.c         | 2 +-
 {http => util/http}/http.h         | 0
 {http => util/http}/http_methods.c | 2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename {http => util/http}/http.c (99%)
 rename {http => util/http}/http.h (100%)
 rename {http => util/http}/http_methods.c (98%)

diff --git a/cmd/camera-streamer/http.c b/cmd/camera-streamer/http.c
index 32a98a4..813d512 100644
--- a/cmd/camera-streamer/http.c
+++ b/cmd/camera-streamer/http.c
@@ -1,4 +1,4 @@
-#include "http/http.h"
+#include "util/http/http.h"
 #include "util/opts/opts.h"
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
diff --git a/cmd/camera-streamer/main.c b/cmd/camera-streamer/main.c
index 6d8daf3..dad9008 100644
--- a/cmd/camera-streamer/main.c
+++ b/cmd/camera-streamer/main.c
@@ -1,4 +1,4 @@
-#include "http/http.h"
+#include "util/http/http.h"
 #include "util/opts/opts.h"
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
diff --git a/cmd/camera-streamer/opts.c b/cmd/camera-streamer/opts.c
index 46c0cfd..7c0028f 100644
--- a/cmd/camera-streamer/opts.c
+++ b/cmd/camera-streamer/opts.c
@@ -1,4 +1,4 @@
-#include "http/http.h"
+#include "util/http/http.h"
 #include "util/opts/opts.h"
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
diff --git a/device/camera/camera_isp.c b/device/camera/camera_isp.c
index 63408db..458826f 100644
--- a/device/camera/camera_isp.c
+++ b/device/camera/camera_isp.c
@@ -7,7 +7,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
-#include "http/http.h"
+#include "util/http/http.h"
 
 int camera_configure_isp(camera_t *camera, buffer_list_t *src_capture, float high_div, float low_div)
 {
diff --git a/device/camera/camera_output.c b/device/camera/camera_output.c
index f644a6a..5bd06bc 100644
--- a/device/camera/camera_output.c
+++ b/device/camera/camera_output.c
@@ -7,7 +7,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
-#include "http/http.h"
+#include "util/http/http.h"
 #include "rtsp/rtsp.h"
 
 static const char *jpeg_names[2] = {
diff --git a/http/http_ffmpeg.c b/http/http_ffmpeg.c
index 8c7a895..93850e6 100644
--- a/http/http_ffmpeg.c
+++ b/http/http_ffmpeg.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "util/opts/log.h"
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
 #include "device/buffer_list.h"
diff --git a/http/http_h264.c b/http/http_h264.c
index 3a3efd3..005ece4 100644
--- a/http/http_h264.c
+++ b/http/http_h264.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "util/opts/log.h"
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
 #include "device/buffer_list.h"
diff --git a/http/http_jpeg.c b/http/http_jpeg.c
index 632347d..0641ccb 100644
--- a/http/http_jpeg.c
+++ b/http/http_jpeg.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"
 
diff --git a/rtsp/rtsp.cc b/rtsp/rtsp.cc
index b96e4b3..2a9ca23 100644
--- a/rtsp/rtsp.cc
+++ b/rtsp/rtsp.cc
@@ -1,6 +1,6 @@
 extern "C" {
 
-#include "http/http.h"
+#include "util/http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
diff --git a/http/http.c b/util/http/http.c
similarity index 99%
rename from http/http.c
rename to util/http/http.c
index 54b156a..d495edd 100644
--- a/http/http.c
+++ b/util/http/http.c
@@ -11,7 +11,7 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include "http/http.h"
+#include "http.h"
 #include "util/opts/log.h"
 
 static int http_listen(int port, int maxcons)
diff --git a/http/http.h b/util/http/http.h
similarity index 100%
rename from http/http.h
rename to util/http/http.h
diff --git a/http/http_methods.c b/util/http/http_methods.c
similarity index 98%
rename from http/http_methods.c
rename to util/http/http_methods.c
index 0004d54..0e2b292 100644
--- a/http/http_methods.c
+++ b/util/http/http_methods.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "http/http.h"
+#include "http.h"
 
 static void http_write_response(
   FILE *stream,