Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run wpiformat on merged repo (#1021)

Browse Source
This commit is contained in:
Tyler Veness
2018-05-13 17:09:56 -07:00
committed by Peter Johnson
parent 0babbf317c
commit 6729a7d6b1
481 changed files with 9581 additions and 6828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cscore/src/main/native/cpp/MjpegServerImpl.cpp
View File

@@ -124,8 +124,8 @@ class MjpegServerImpl::ConnThread : public wpi::SafeThread {
// A browser should connect for each file and not serve files from its cache.
// Using cached pictures would lead to showing old/outdated pictures.
// Many browsers seem to ignore, or at least not always obey, those headers.
static void SendHeader(wpi::raw_ostream& os, int code,
wpi::StringRef codeText, wpi::StringRef contentType,
static void SendHeader(wpi::raw_ostream& os, int code, wpi::StringRef codeText,
wpi::StringRef contentType,
wpi::StringRef extra = wpi::StringRef{}) {
os << "HTTP/1.0 " << code << ' ' << codeText << "\r\n";
os << "Connection: close\r\n"
@@ -143,8 +143,7 @@ static void SendHeader(wpi::raw_ostream& os, int code,
// Send error header and message
// @param code HTTP error code (e.g. 404)
// @param message Additional message text
static void SendError(wpi::raw_ostream& os, int code,
wpi::StringRef message) {
static void SendError(wpi::raw_ostream& os, int code, wpi::StringRef message) {
wpi::StringRef codeText, extra, baseMessage;
switch (code) {
case 401:
@@ -733,8 +732,7 @@ void MjpegServerImpl::ConnThread::ProcessRequest() {
} else if (req.find("GET /output") != wpi::StringRef::npos &&
req.find(".json") != wpi::StringRef::npos) {
kind = kGetSettings;
} else if ((pos = req.find("GET /?action=command")) !=
wpi::StringRef::npos) {
} else if ((pos = req.find("GET /?action=command")) != wpi::StringRef::npos) {
kind = kCommand;
parameters = req.substr(req.find('&', pos + 20)).substr(1);
} else if (req.find("GET / ") != wpi::StringRef::npos || req == "GET /\n") {