Changes to compile successfully using -Wpedantic

PythonGermany · PythonGermany · commit 23723761d510 · 2023-10-25T09:37:29.000+02:00
diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ OBJ			:= $(addprefix $(OBJ_DIR)/, $(SRC:%.cpp=%.o))
 DEPS		:= $(addprefix $(INC_DIR)/, $(HEADERS))
 
 CXX			:= c++
-CXXFLAGS	:= -Wall -Wextra -Werror -std=c++98 -Iinclude -Iinclude/poll -Iinclude/config -Iinclude/http -Iinclude/utils -Iinclude/output
+CXXFLAGS	:= -Wall -Wextra -Werror -Wpedantic -std=c++98 -Iinclude -Iinclude/poll -Iinclude/config -Iinclude/http -Iinclude/utils -Iinclude/output
 
 all: $(NAME)
 
diff --git a/include/config/Config.hpp b/include/config/Config.hpp
@@ -186,4 +186,4 @@ class Config {
   void throwExeption(size_t line, std::string msg);
 };
 
-#endif
+#endif
diff --git a/include/config/Context.hpp b/include/config/Context.hpp
@@ -67,4 +67,4 @@ class Context {
   void addTokenOccurence(std::string token);
 };
 
-#endif
+#endif
diff --git a/include/config/Init.hpp b/include/config/Init.hpp
@@ -20,4 +20,4 @@ class Init {
   static void initPoll();
 };
 
-#endif
+#endif
diff --git a/include/config/argument.hpp b/include/config/argument.hpp
@@ -10,7 +10,7 @@ typedef enum arg_state_e {
   SUCCESS,
   FLAG_UNKNOWN,
   FLAG_DUPLICATE,
-  ARG_INVALID,
+  ARG_INVALID
 } arg_state_t;
 
 typedef struct arg_s {
@@ -48,4 +48,4 @@ const arg_t args_g[] = {{'i', 0, setPrintInfo},
 
 std::string loadArguments(int argc, char **argv);
 
-#endif
+#endif
diff --git a/include/global.hpp b/include/global.hpp
@@ -7,4 +7,4 @@ extern Log accessLog_g;
 extern Log errorLog_g;
 extern std::string cwd_g;
 
-#endif
+#endif
diff --git a/include/http/Request.hpp b/include/http/Request.hpp
@@ -40,4 +40,4 @@ class Request {
   int parseHeaderFields(std::string fields);
 };
 
-#endif
+#endif
diff --git a/include/http/Response.hpp b/include/http/Response.hpp
@@ -50,4 +50,4 @@ class Response {
   std::string generateHead();
 };
 
-#endif
+#endif
diff --git a/include/http/Uri.hpp b/include/http/Uri.hpp
@@ -49,4 +49,4 @@ class Uri {
   bool compare(const Uri &rhs) const;
 };
 
-#endif
+#endif
diff --git a/include/http/VirtualHost.hpp b/include/http/VirtualHost.hpp
@@ -38,4 +38,4 @@ class VirtualHost {
   Context *matchLocation(const std::string &uri);
 };
 
-#endif
+#endif
diff --git a/include/output/Log.hpp b/include/output/Log.hpp
@@ -78,4 +78,4 @@ class Log {
   std::string getLevelColor(log_level_t level);
 };
 
-#endif
+#endif
diff --git a/include/output/colors.hpp b/include/output/colors.hpp
@@ -22,4 +22,4 @@
 #define BRIGHT_CYAN "\033[96m"
 #define BRIGHT_WHITE "\033[97m"
 
-#endif
+#endif
diff --git a/include/output/output.hpp b/include/output/output.hpp
@@ -6,11 +6,7 @@
 #include "colors.hpp"
 #include "webserv.hpp"
 
-typedef enum output_flag_e {
-  SET = 0b1,
-  PRINT = 0b10,
-  UNSET = 0b100
-} output_flag_t;
+typedef enum output_flag_e { SET = 1, PRINT = 2, UNSET = 4 } output_flag_t;
 
 // Information output functions can be triggered through flags. They need to be
 // called once with set = true in order to print out any text should they be
@@ -22,4 +18,4 @@ int printConfigStructure(int flags, std::string data = "");
 int printConfigValidation(int flags, std::string path = "");
 int printVersion(int flags);
 
-#endif
+#endif
diff --git a/include/poll/CallbackPointer.hpp b/include/poll/CallbackPointer.hpp
@@ -13,4 +13,4 @@ class CallbackPointer {
   ~CallbackPointer();
   CallbackPointer &operator=(CallbackPointer const &other);
 };
-#endif  // CALLBACKPOINTER_HPP
+#endif  // CALLBACKPOINTER_HPP
diff --git a/include/utils/File.hpp b/include/utils/File.hpp
@@ -70,4 +70,4 @@ class File {
   int createDirPath();
 };
 
-#endif
+#endif
diff --git a/include/utils/utils.hpp b/include/utils/utils.hpp
@@ -163,4 +163,4 @@ void addSets(std::set<T>& a, const std::set<T> b) {
 // @param baseFactor The base factor e.g. 1000 or 1024
 size_t toBytes(std::string size, size_t baseFactor = 1024);
 
-#endif
+#endif
diff --git a/include/webserv.hpp b/include/webserv.hpp
@@ -4,4 +4,4 @@
 #define WEBSERV_VERSION "0.0"
 #define WEBSERV_ID "webserv/" WEBSERV_VERSION
 
-#endif
+#endif
diff --git a/src/config/Config.cpp b/src/config/Config.cpp
@@ -351,4 +351,4 @@ void Config::checkError(size_t line, std::string error) {
 
 void Config::throwExeption(size_t line, std::string msg) {
   throw std::runtime_error(_path + ":" + toString(line) + ": " + msg);
-}
+}
diff --git a/src/config/Context.cpp b/src/config/Context.cpp
@@ -146,4 +146,4 @@ void Context::addTokenOccurence(std::string token) {
     _tokenOccurences[token] = 1;
   else
     _tokenOccurences[token]++;
-}
+}
diff --git a/src/config/Init.cpp b/src/config/Init.cpp
@@ -117,4 +117,4 @@ void Init::initPoll() {
   accessLog_g.write("Number of sockets: " + toString(sockets), INFO);
   accessLog_g.write("---------- Sockets created ----------", INFO,
                     BRIGHT_GREEN);
-}
+}
diff --git a/src/config/argument.cpp b/src/config/argument.cpp
@@ -129,4 +129,4 @@ std::string loadArguments(int argc, char **argv) {
     }
   }
   return path;
-}
+}
diff --git a/src/global.cpp b/src/global.cpp
@@ -2,4 +2,4 @@
 
 Log accessLog_g(LOG_TERMINAL);
 Log errorLog_g(LOG_ERROR_TERMINAL);
-std::string cwd_g;
+std::string cwd_g;
diff --git a/src/http/Request.cpp b/src/http/Request.cpp
@@ -101,4 +101,4 @@ int Request::parseHeaderFields(std::string fields) {
     fields.erase(0, line.size() + 2);
     if (fields.empty()) return 0;
   }
-}
+}
diff --git a/src/http/Response.cpp b/src/http/Response.cpp
@@ -86,4 +86,4 @@ std::string Response::generateHead() {
   }
   response += "\r\n";
   return response;
-}
+}
diff --git a/src/http/Uri.cpp b/src/http/Uri.cpp
@@ -147,4 +147,4 @@ int Uri::resolveDots() {
 bool Uri::compare(const Uri &rhs) const {
   return _scheme == rhs._scheme && _host == rhs._host && _port == rhs._port &&
          _path == rhs._path && _query == rhs._query;
-}
+}
diff --git a/src/http/VirtualHost.cpp b/src/http/VirtualHost.cpp
@@ -107,4 +107,4 @@ Context *VirtualHost::matchLocation(const std::string &uri) {
     }
   }
   return match;
-}
+}
diff --git a/src/output/Log.cpp b/src/output/Log.cpp
@@ -78,4 +78,4 @@ std::string Log::getLevelColor(log_level_t level) {
     }
   }
   return RESET;
-}
+}
diff --git a/src/output/output.cpp b/src/output/output.cpp
@@ -6,16 +6,17 @@ void printInfo(int flags) {
   static bool isSet = false;
   if (getBit(SET, flags)) isSet = true;
   if (isSet && getBit(PRINT, flags)) {
-    std::cout
-        << BRIGHT_GREEN
-        << "▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄\r\n"
-           "██ ▄ ██ ▄ ███ ███ █ ▄▄█ ▄▄▀█ ▄▄█ ▄▄█ ▄▄▀█ ███ █\r\n"
-           "█ ▀▀ ▀██▀▄███▄▀ ▀▄█ ▄▄█ ▄▄▀█▄▄▀█ ▄▄█ ▀▀▄██ ▀ ██\r\n"
-           "████ ██ ▀▀████▄█▄██▄▄▄█▄▄▄▄█▄▄▄█▄▄▄█▄█▄▄███▄███\r\n"
-           "\e[102m█ - An HTTP server with basic functionality - █\e[49m\r\n"
-           "\e[102m█ https://github.com/PythonGermany/42_webserv █\e[49m\r\n"
-           "▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀"
-        << RESET << std::endl;
+    std::cout << BRIGHT_GREEN
+              << "▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄\r\n"
+                 "██ ▄ ██ ▄ ███ ███ █ ▄▄█ ▄▄▀█ ▄▄█ ▄▄█ ▄▄▀█ ███ █\r\n"
+                 "█ ▀▀ ▀██▀▄███▄▀ ▀▄█ ▄▄█ ▄▄▀█▄▄▀█ ▄▄█ ▀▀▄██ ▀ ██\r\n"
+                 "████ ██ ▀▀████▄█▄██▄▄▄█▄▄▄▄█▄▄▄█▄▄▄█▄█▄▄███▄███\r\n"
+                 "\033[102m█ - An HTTP server with basic functionality - "
+                 "█\033[49m\r\n"
+                 "\033[102m█ https://github.com/PythonGermany/42_webserv "
+                 "█\033[49m\r\n"
+                 "▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀"
+              << RESET << std::endl;
   }
   if (getBit(UNSET, flags)) isSet = false;
 }
@@ -83,4 +84,4 @@ int printVersion(int flags) {
   }
   if (getBit(UNSET, flags)) isSet = false;
   return ret;
-}
+}
diff --git a/src/utils/File.cpp b/src/utils/File.cpp
@@ -110,4 +110,4 @@ int File::createDirPath() {
     pos = _path.find_first_of('/', pos + 1);
   }
   return 0;
-}
+}
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
@@ -163,21 +163,27 @@ std::string getTime(std::string format, const time_t* timer) {
   }
   if (!endsWith(format, " GMT")) format += " GMT";
   while (true) {
-    char buffer[size];
+    std::string buffer(size, '\0');
     timeinfo = std::gmtime(timer);
-    if (std::strftime(buffer, size, format.c_str(), timeinfo) != 0)
-      return std::string(buffer);
+    size_t ret = std::strftime(&buffer[0], size, format.c_str(), timeinfo);
+    if (ret != 0) {
+      buffer.resize(ret);
+      return buffer;
+    }
     if (size > 256) return "";
     size *= 2;
   }
 }
-
 std::string getcwd() {
   size_t size = 1024;
 
   while (true) {
-    char buffer[size];
-    if (getcwd(buffer, size) != NULL) return buffer;
+    std::string buffer(size, '\0');
+    if (getcwd(&buffer[0], size) != NULL) {
+      size_t end = buffer.find('\0');
+      if (end != std::string::npos) buffer.resize(end);
+      return buffer;
+    }
     if (errno != ERANGE || size > PATH_MAX) return "";
     size += 1024;
   }
@@ -200,4 +206,4 @@ size_t toBytes(std::string size, size_t baseFactor) {
     factor = baseFactor * baseFactor;
   }
   return fromString<size_t>(size) * factor;
-}
+}

-Original file line number
+Diff line change
   void throwExeption(size_t line, std::string msg);
 };
 -#endif
 +#endif