Unify httpd.cpp from Nageru and Futatabi (whitespace differences, and metrics support).

[nageru] / shared / httpd.h

diff --git a/futatabi/httpd.h b/shared/httpd.h
similarity index 95%
rename from futatabi/httpd.h
rename to shared/httpd.h
index 9901814586cb913ca06c7f6afc4f39364561f5ac..5b2b266c36e70788b2daabe018251d50392fcd7a 100644 (file)
--- a/futatabi/httpd.h
+++ b/shared/httpd.h
@@ -68,14 +68,14 @@ private:
 
        static void free_stream(void *cls);
 
-
        class Stream {
        public:
                enum Framing {
                        FRAMING_RAW,
                        FRAMING_METACUBE
                };
-               Stream(HTTPD *parent, Framing framing) : parent(parent), framing(framing) {}
+               Stream(HTTPD *parent, Framing framing)
+                       : parent(parent), framing(framing) {}
 
                static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
                ssize_t reader_callback(uint64_t pos, char *buf, size_t max);
@@ -112,7 +112,7 @@ private:
        std::string header;
 
        // Metrics.
-       std::atomic<int64_t> metric_num_connected_clients{0};
+       std::atomic<int64_t> metric_num_connected_clients{ 0 };
 };
 
 #endif  // !defined(_HTTPD_H)