Skip to content

Commit a1eeaac

Browse files
committed
Rename http_parse_post_v2 to http_parse_post
Replaces all usages and declarations of http_parse_post_v2 with http_parse_post for consistency and clarity. No functional changes were made; this is a refactor to simplify the function name. #1052
1 parent 19e8803 commit a1eeaac

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

unittests/http.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ TEST (http, parse_post)
6868
container standard = {
6969
{"key", "value"},
7070
};
71-
http_parse_post_v2 (posted, webserver_request);
71+
http_parse_post (posted, webserver_request);
7272
EXPECT_EQ(standard, webserver_request.post);
7373
}
7474
{
@@ -77,7 +77,7 @@ TEST (http, parse_post)
7777
{"key1", "value1"},
7878
{"key2", "value2"},
7979
};
80-
http_parse_post_v2 (posted, webserver_request);
80+
http_parse_post (posted, webserver_request);
8181
EXPECT_EQ(standard, webserver_request.post);
8282
}
8383
{
@@ -86,23 +86,23 @@ TEST (http, parse_post)
8686
{"key1", ""},
8787
{"key2", ""},
8888
};
89-
http_parse_post_v2 (posted, webserver_request);
89+
http_parse_post (posted, webserver_request);
9090
EXPECT_EQ(standard, webserver_request.post);
9191
}
9292
{
9393
const std::string posted {"key=Hello+World"};
9494
container standard = {
9595
{"key", "Hello World"},
9696
};
97-
http_parse_post_v2 (posted, webserver_request);
97+
http_parse_post (posted, webserver_request);
9898
EXPECT_EQ(standard, webserver_request.post);
9999
}
100100
{
101101
const std::string posted {"key=H%C3%ABllo+W%C3%B6rld"};
102102
container standard = {
103103
{"key", "Hëllo Wörld"},
104104
};
105-
http_parse_post_v2 (posted, webserver_request);
105+
http_parse_post (posted, webserver_request);
106106
EXPECT_EQ(standard, webserver_request.post);
107107
}
108108
}
@@ -117,7 +117,7 @@ TEST (http, parse_post)
117117
container standard = {
118118
{"key", "value"},
119119
};
120-
http_parse_post_v2 (posted, webserver_request);
120+
http_parse_post (posted, webserver_request);
121121
EXPECT_EQ(standard, webserver_request.post);
122122
}
123123

@@ -130,7 +130,7 @@ TEST (http, parse_post)
130130
{"key1", "value1"},
131131
{"key2", "value2"},
132132
};
133-
http_parse_post_v2 (posted, webserver_request);
133+
http_parse_post (posted, webserver_request);
134134
EXPECT_EQ(standard, webserver_request.post);
135135
}
136136

@@ -143,7 +143,7 @@ TEST (http, parse_post)
143143
{"key1", ""},
144144
{"key2", ""},
145145
};
146-
http_parse_post_v2 (posted, webserver_request);
146+
http_parse_post (posted, webserver_request);
147147
EXPECT_EQ(standard, webserver_request.post);
148148
}
149149

@@ -154,7 +154,7 @@ TEST (http, parse_post)
154154
container standard = {
155155
{"key", "Hello World"},
156156
};
157-
http_parse_post_v2 (posted, webserver_request);
157+
http_parse_post (posted, webserver_request);
158158
EXPECT_EQ(standard, webserver_request.post);
159159
}
160160

@@ -165,7 +165,7 @@ TEST (http, parse_post)
165165
container standard = {
166166
{"key", "Hëllo Wörld"},
167167
};
168-
http_parse_post_v2 (posted, webserver_request);
168+
http_parse_post (posted, webserver_request);
169169
EXPECT_EQ(standard, webserver_request.post);
170170
}
171171
}
@@ -181,7 +181,7 @@ TEST (http, parse_post)
181181
const std::string content = filter_url_file_get_contents(test_path + "http-post-1.txt");
182182
Webserver_Request webserver_request{};
183183
webserver_request.content_type = content_type;
184-
http_parse_post_v2 (content, webserver_request);
184+
http_parse_post (content, webserver_request);
185185
const container standard_new {
186186
{"filename", "00_test1.txt"},
187187
{"data", "Contents for test1.\nLine one 1.\nLine two 1.\nLine three 1.\n"},
@@ -195,7 +195,7 @@ TEST (http, parse_post)
195195
const std::string content = filter_url_file_get_contents(test_path + "http-post-2.txt");
196196
Webserver_Request webserver_request{};
197197
webserver_request.content_type = content_type;
198-
http_parse_post_v2 (content, webserver_request);
198+
http_parse_post (content, webserver_request);
199199
const container standard {
200200
{"filename", "00_test1.txt"},
201201
{"data", "Contents for test1.\nLine one 1.\nLine two 1.\nLine three 1.\n"},

webserver/http.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ bool http_parse_header (std::string header, Webserver_Request& webserver_request
157157

158158

159159
// Takes data POSTed from the browser, and parses it.
160-
void http_parse_post_v2 (std::string content, Webserver_Request& webserver_request)
160+
void http_parse_post (std::string content, Webserver_Request& webserver_request)
161161
{
162162
// If there's no content, there's nothing to parse: Done.
163163
if (content.empty ())

webserver/http.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ constexpr const char* text_plain {"text/plain"};
2828
constexpr const char* multipart_form_data {"multipart/form-data"};
2929

3030
bool http_parse_header (std::string header, Webserver_Request& webserver_request);
31-
void http_parse_post_v2 (std::string content, Webserver_Request& webserver_request);
31+
void http_parse_post (std::string content, Webserver_Request& webserver_request);
3232
void http_assemble_response (Webserver_Request& webserver_request);
3333
void http_stream_file (Webserver_Request& webserver_request, bool enable_cache);
3434
std::string http_parse_host (const std::string & line);

webserver/webserver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static void webserver_process_request (const int connfd, const std::string& clie
220220

221221
if (connection_healthy) {
222222

223-
http_parse_post_v2 (postdata, request);
223+
http_parse_post (postdata, request);
224224

225225
// Assemble response.
226226
bootstrap_index (request);
@@ -683,7 +683,7 @@ static void secure_webserver_process_request (mbedtls_ssl_config * conf, mbedtls
683683
if (total_bytes_read < request.content_length) connection_healthy = false;
684684
// Parse the POSTed data.
685685
if (connection_healthy) {
686-
http_parse_post_v2 (postdata, request);
686+
http_parse_post (postdata, request);
687687
}
688688
}
689689

0 commit comments

Comments
 (0)