X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=parse.cpp;h=3f373c43cb72d1633bd2daea655cd1c73a152b91;hp=37b5436bd6d7bc82cd7890e0082ad6a26543f727;hb=cb042ee88b5f4cd6e5f55bada4d9d86807f1640b;hpb=8d15ccbfc46a7f0b96a47109d8f8f2495082b8f6

diff --git a/parse.cpp b/parse.cpp
index 37b5436..3f373c4 100644
--- a/parse.cpp
+++ b/parse.cpp
@@ -56,9 +56,9 @@ vector<string> split_lines(const string &str)
 	return ret;
 }
 
-multimap<string, string> extract_headers(const vector<string> &lines, const string &log_context)
+HTTPHeaderMultimap extract_headers(const vector<string> &lines, const string &log_context)
 {
-	multimap<string, string> parameters;
+	HTTPHeaderMultimap parameters;
 	for (size_t i = 1; i < lines.size(); ++i) {
 		size_t split = lines[i].find(":");
 		if (split == string::npos) {
@@ -100,7 +100,7 @@ RequestParseStatus wait_for_double_newline(string *existing_data, const char *ne
 	const char *ptr = reinterpret_cast<char *>(
 		memmem(existing_data->data() + start_at, existing_data->size() - start_at,
 		       "\r\n\r\n", 4));
-	if (ptr == NULL) {
+	if (ptr == nullptr) {
 		return RP_NOT_FINISHED_YET;
 	}
 	if (ptr != existing_data->data() + existing_data->size() - 4) {