Skip to content

Commit cce15ff

Browse files
committed
Style improvements
1 parent e65c9ff commit cce15ff

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

docker/docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.8'
2-
31
services:
42
webserv:
53
container_name: webserv

docker/webserv/tools/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ if ! wp core is-installed --path=$folder; then
4141
--admin_user=$WORDPRESS_USER --admin_password=$WORDPRESS_PASSWORD --admin_email=$WORDPRESS_EMAIL
4242
fi
4343

44-
make && ./webserv $WEBSERV_ARGS
44+
make && ./bin/webserv $WEBSERV_ARGS

include/config/Config.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class Config {
105105
// Removes all comments from the config file
106106
// @exception No custom exceptions
107107
void removeComments();
108+
108109
// Recursively parses a context
109110
// @param context The context to add data to
110111
// @param data The data to parse
@@ -174,7 +175,7 @@ class Config {
174175
// Throws an exeption with the given message and line
175176
// @param line The line in the config file where the error occured
176177
// @param msg The message to display
177-
// @return std::runtime_error
178+
// @exception std::runtime_error
178179
void throwExeption(size_t line, std::string msg);
179180
};
180181

include/config/Context.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Context {
4040
void setArgs(std::vector<std::string> args);
4141
void setTokenOccurences(std::map<std::string, size_t> tokenOccurences);
4242
void addDirective(std::string token, std::vector<std::string> values);
43-
std::string addContext(Context &context);
43+
void addContext(Context &context);
4444

4545
// Removes all directives with the given token
4646
// @exception No custom exceptions

src/config/Context.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,9 @@ void Context::addDirective(std::string token, std::vector<std::string> values) {
7979
addTokenOccurence(token);
8080
}
8181

82-
std::string Context::addContext(Context &context) {
82+
void Context::addContext(Context &context) {
8383
_contexts[context.getName()].push_back(context);
8484
addTokenOccurence(context.getName());
85-
return "";
8685
}
8786

8887
void Context::removeDirective(std::string token) {

0 commit comments

Comments
 (0)