Mercurial > malikania
changeset 3:67edc8b3e5e9
Misc: change header guards
While here, remove useless Directory and Hash.
Task: #433
line wrap: on
line diff
--- a/libclient/malikania/Animation.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Animation.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_ANIMATION_H_ -#define _MALIKANIA_ANIMATION_H_ +#ifndef MALIKANIA_ANIMATION_H +#define MALIKANIA_ANIMATION_H /** * @file Animation.h @@ -151,4 +151,4 @@ } // !malikania -#endif // !_MALIKANIA_ANIMATION_H_ +#endif // !MALIKANIA_ANIMATION_H
--- a/libclient/malikania/Animator.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Animator.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_ANIMATOR_H_ -#define _MALIKANIA_ANIMATOR_H_ +#ifndef MALIKANIA_ANIMATOR_H +#define MALIKANIA_ANIMATOR_H /** * @file Animator.h @@ -71,4 +71,4 @@ } // !malikania -#endif // !_MALIKANIA_ANIMATOR_H_ +#endif // !MALIKANIA_ANIMATOR_H
--- a/libclient/malikania/ClientResourcesLoader.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/ClientResourcesLoader.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_CLIENT_RESOURCES_LOADER_H_ -#define _MALIKANIA_CLIENT_RESOURCES_LOADER_H_ +#ifndef MALIKANIA_CLIENT_RESOURCES_LOADER_H +#define MALIKANIA_CLIENT_RESOURCES_LOADER_H #include <malikania/ResourcesLoader.h> @@ -109,4 +109,4 @@ } // !malikania -#endif // !_MALIKANIA_CLIENT_RESOURCES_LOADER_H_ +#endif // !MALIKANIA_CLIENT_RESOURCES_LOADER_H
--- a/libclient/malikania/Color.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Color.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_COLOR_H_ -#define _MALIKANIA_COLOR_H_ +#ifndef MALIKANIA_COLOR_H +#define MALIKANIA_COLOR_H #include <cstdint> #include <string> @@ -123,4 +123,4 @@ } // !malikania -#endif // !_MALIKANIA_COLOR_H_ +#endif // !MALIKANIA_COLOR_H
--- a/libclient/malikania/Label.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Label.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,12 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_LABEL_H_ -#define _MALIKANIA_LABEL_H_ - -#include <malikania/Json.h> - -#include <Config.h> +#ifndef MALIKANIA_LABEL_H +#define MALIKANIA_LABEL_H #include "Image.h" #include "Color.h" @@ -70,4 +66,4 @@ }// !malikania -#endif // !_MALIKANIA_LABEL_H_ +#endif // !MALIKANIA_LABEL_H
--- a/libclient/malikania/Line.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Line.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_LINE_H_ -#define _MALIKANIA_LINE_H_ +#ifndef MALIKANIA_LINE_H +#define MALIKANIA_LINE_H /** * @file Line.h @@ -123,4 +123,4 @@ } // !malikania -#endif // !_MALIKANIA_LINE_H_ +#endif // !MALIKANIA_LINE_H
--- a/libclient/malikania/Point.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Point.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_POINT_H_ -#define _MALIKANIA_POINT_H_ +#ifndef MALIKANIA_POINT_H +#define MALIKANIA_POINT_H /** * @file Point.h @@ -95,4 +95,4 @@ } // !malikania -#endif // !_MALIKANIA_POINT_H_ +#endif // !MALIKANIA_POINT_H
--- a/libclient/malikania/Rectangle.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Rectangle.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_RECTANGLE_H_ -#define _MALIKANIA_RECTANGLE_H_ +#ifndef MALIKANIA_RECTANGLE_H +#define MALIKANIA_RECTANGLE_H /** * @file Rectangle.h @@ -135,4 +135,4 @@ } // !malikania -#endif // !_MALIKANIA_RECTANGLE_H_ +#endif // !MALIKANIA_RECTANGLE_H
--- a/libclient/malikania/Size.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Size.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_SIZE_H_ -#define _MALIKANIA_SIZE_H_ +#ifndef MALIKANIA_SIZE_H +#define MALIKANIA_SIZE_H namespace malikania { @@ -100,4 +100,4 @@ } // !malikania -#endif // !_MALIKANIA_SIZE_H_ +#endif // !MALIKANIA_SIZE_H
--- a/libclient/malikania/Sprite.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/Sprite.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_SPRITE_H_ -#define _MALIKANIA_SPRITE_H_ +#ifndef MALIKANIA_SPRITE_H +#define MALIKANIA_SPRITE_H /** * @file Sprite.h @@ -143,4 +143,4 @@ } // !malikania -#endif // !_MALIKANIA_SPRITE_H_ +#endif // !MALIKANIA_SPRITE_H
--- a/libclient/malikania/backend/sdl/FontBackend.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/backend/sdl/FontBackend.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_FONT_SDL_H -#define MALIKANIA_FONT_SDL_H +#ifndef MALIKANIA_FONT_BACKEND_H +#define MALIKANIA_FONT_BACKEND_H #include <memory> @@ -50,4 +50,4 @@ } // !malikania -#endif // !MALIKANIA_FONT_SDL_H +#endif // !MALIKANIA_FONT_BACKEND_H
--- a/libclient/malikania/backend/sdl/ImageBackend.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/backend/sdl/ImageBackend.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_IMAGE_SDL_H -#define MALIKANIA_IMAGE_SDL_H +#ifndef MALIKANIA_IMAGE_BACKEND_H +#define MALIKANIA_IMAGE_BACKEND_H #include <memory> @@ -60,4 +60,4 @@ } // !malikania -#endif // !MALIKANIA_IMAGE_SDL_H +#endif // !MALIKANIA_IMAGE_BACKEND_H
--- a/libclient/malikania/backend/sdl/WindowBackend.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libclient/malikania/backend/sdl/WindowBackend.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef MALIKANIA_WINDOW_SDL_H -#define MALIKANIA_WINDOW_SDL_H +#ifndef MALIKANIA_WINDOW_BACKEND_H +#define MALIKANIA_WINDOW_BACKEND_H #include <memory> #include <vector> @@ -73,4 +73,4 @@ } // !malikania -#endif // !MALIKANIA_WINDOW_SDL_H +#endif // !MALIKANIA_WINDOW_BACKEND_H
--- a/libcommon/CMakeLists.txt Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/CMakeLists.txt Tue Mar 22 22:50:35 2016 +0100 @@ -19,32 +19,26 @@ set( HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Application.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Directory.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Game.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ElapsedTimer.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Game.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Hash.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Id.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Js.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Json.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLoader.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLocator.h ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Util.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Sockets.h ) set( SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Application.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Directory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ElapsedTimer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Hash.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Js.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Json.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLoader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLocator.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Util.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Sockets.cpp ) if (WITH_BACKEND_SDL)
--- a/libcommon/malikania/Application.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/Application.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_APPLICATION_H_ -#define _MALIKANIA_APPLICATION_H_ +#ifndef MALIKANIA_APPLICATION_H +#define MALIKANIA_APPLICATION_H /** * @file Application.h @@ -48,5 +48,4 @@ } // !malikania -#endif // !_MALIKANIA_APPLICATION_H_ - +#endif // !MALIKANIA_APPLICATION_H
--- a/libcommon/malikania/Directory.cpp Tue Mar 22 22:35:33 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ -/* - * Directory.cpp -- open and read directories - * - * Copyright (c) 2013, 2014 David Demelier <markand@malikania.fr> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sstream> -#include <stdexcept> - -#include "Directory.h" - -#if defined(_WIN32) -# include <Windows.h> -#else -# include <cstring> -# include <cerrno> - -# include <sys/types.h> -# include <dirent.h> -#endif - -namespace malikania { - -#if defined(_WIN32) - -namespace { - -std::string systemError() -{ - LPSTR error = nullptr; - std::string errmsg = "Unknown error"; - - FormatMessageA( - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPSTR)&error, 0, NULL); - - if (error) { - errmsg = std::string(error); - LocalFree(error); - } - - return errmsg; -} - -} - -void Directory::systemLoad(const std::string &path, int flags) -{ - std::ostringstream oss; - HANDLE handle; - WIN32_FIND_DATA fdata; - - oss << path << "\\*"; - handle = FindFirstFile(oss.str().c_str(), &fdata); - - if (handle == nullptr) - throw std::runtime_error(systemError()); - - do { - Entry entry; - - entry.name = fdata.cFileName; - if ((flags & Directory::NotDot) && entry.name == ".") - continue; - if ((flags & Directory::NotDotDot) && entry.name == "..") - continue; - - switch (fdata.dwFileAttributes) { - case FILE_ATTRIBUTE_DIRECTORY: - entry.type = Dir; - break; - case FILE_ATTRIBUTE_NORMAL: - entry.type = File; - break; - case FILE_ATTRIBUTE_REPARSE_POINT: - entry.type = Link; - break; - default: - break; - } - - m_list.push_back(entry); - } while (FindNextFile(handle, &fdata) != 0); - - FindClose(handle); -} - -#else - -void Directory::systemLoad(const std::string &path, int flags) -{ - DIR *dp; - struct dirent *ent; - - if ((dp = opendir(path.c_str())) == nullptr) - throw std::runtime_error(strerror(errno)); - - while ((ent = readdir(dp)) != nullptr) { - Entry entry; - - entry.name = ent->d_name; - if ((flags & Directory::NotDot) && entry.name == ".") - continue; - if ((flags & Directory::NotDotDot) && entry.name == "..") - continue; - - switch (ent->d_type) { - case DT_DIR: - entry.type = Dir; - break; - case DT_REG: - entry.type = File; - break; - case DT_LNK: - entry.type = Link; - break; - default: - break; - } - - m_list.push_back(entry); - } - - closedir(dp); -} - -#endif - -Directory::Entry::Entry() - : type(Unknown) -{ -} - -bool operator==(const Directory::Entry &e1, const Directory::Entry &e2) -{ - return e1.name == e2.name && e1.type == e2.type; -} - -Directory::Directory() -{ -} - -Directory::Directory(const std::string &path, int flags) -{ - systemLoad(path, flags); -} - -Directory::List::iterator Directory::begin() -{ - return m_list.begin(); -} - -Directory::List::const_iterator Directory::cbegin() const -{ - return m_list.cbegin(); -} - -Directory::List::iterator Directory::end() -{ - return m_list.end(); -} - -Directory::List::const_iterator Directory::cend() const -{ - return m_list.cend(); -} - -int Directory::count() const -{ - return m_list.size(); -} - -bool operator==(const Directory &d1, const Directory &d2) -{ - return d1.m_list == d2.m_list; -} - -} // !malikania
--- a/libcommon/malikania/Directory.h Tue Mar 22 22:35:33 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ -/* - * Directory.h -- open and read directories - * - * Copyright (c) 2013, 2014 David Demelier <markand@malikania.fr> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _DIRECTORY_H_ -#define _DIRECTORY_H_ - -#include <cstddef> -#include <string> -#include <vector> - -namespace malikania { - -/** - * @class Directory - * @brief class to manipulate directories - * - * This class allow the user to iterate directories in a for range based - * loop using iterators. - */ -class Directory { -public: - /** - * @enum Flags - * @brief optional flags to read directories - */ - enum Flags { - NotDot = (1 << 0), - NotDotDot = (1 << 1) - }; - - /** - * @enum Type - * @brief Describe the type of an entry - */ - enum Type { - Unknown = 0, - File, - Dir, - Link - }; - - /** - * @struct Entry - * @brief entry in the directory list - */ - struct Entry { - std::string name; //! name of entry (base name) - Type type; //! type of file - - Entry(); - - friend bool operator==(const Entry &e1, const Entry &e2); - }; - - using List = std::vector<Entry>; - - // C++ Container compatibility - using value_type = List::value_type; - using iterator = List::iterator; - using const_iterator = List::const_iterator; - -private: - List m_list; - - void systemLoad(const std::string &path, int flags); - -public: - /** - * Default constructor, does nothing. - */ - Directory(); - - /** - * Open a directory and read all its content. - * @param path the path - * @param flags the optional flags - */ - Directory(const std::string &path, int flags = 0); - - /** - * Return an iterator the beginning. - * - * @return the iterator - */ - List::iterator begin(); - - /** - * Return a const iterator the beginning. - * - * @return the iterator - */ - List::const_iterator cbegin() const; - - /** - * Return an iterator to past the end. - * - * @return the iterator - */ - List::iterator end(); - - /** - * Return a const iterator to past the end. - * - * @return the iterator - */ - List::const_iterator cend() const; - - /** - * Get the number of entries in the directory. - * - * @return the number - */ - int count() const; - - friend bool operator==(const Directory &d1, const Directory &d2); -}; - -} // !malikania - -#endif // !_DIRECTORY_H_
--- a/libcommon/malikania/ElapsedTimer.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/ElapsedTimer.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_ELAPSED_TIMER_H_ -#define _MALIKANIA_ELAPSED_TIMER_H_ +#ifndef MALIKANIA_ELAPSED_TIMER_H +#define MALIKANIA_ELAPSED_TIMER_H /** * @file ElapsedTimer.h @@ -78,4 +78,4 @@ } // !malikania -#endif // !_MALIKANIA_ELAPSED_TIMER_H_ +#endif // !MALIKANIA_ELAPSED_TIMER_H
--- a/libcommon/malikania/Game.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/Game.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _GAME_H_ -#define _GAME_H_ +#ifndef MALIKANIA_GAME_H +#define MALIKANIA_GAME_H #include <cassert> #include <string> @@ -121,4 +121,4 @@ } // !malikania -#endif // !_GAME_H_ +#endif // !MALIKANIA_GAME_H
--- a/libcommon/malikania/Hash.cpp Tue Mar 22 22:35:33 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* - * Hash.cpp -- hash functions - * - * Copyright (c) 2013, 2014 David Demelier <markand@malikania.fr> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "Hash.h" - -#include <openssl/sha.h> -#include <openssl/md5.h> - -std::string Hash::md5(const std::string &input) -{ - return convert<MD5_CTX, MD5_DIGEST_LENGTH>(input, MD5_Init, MD5_Update, MD5_Final); -} - -std::string Hash::sha1(const std::string &input) -{ - return convert<SHA_CTX, SHA_DIGEST_LENGTH>(input, SHA1_Init, SHA1_Update, SHA1_Final); -} - -std::string Hash::sha256(const std::string &input) -{ - return convert<SHA256_CTX, SHA256_DIGEST_LENGTH>(input, SHA256_Init, SHA256_Update, SHA256_Final); -} - -std::string Hash::sha512(const std::string &input) -{ - return convert<SHA512_CTX, SHA512_DIGEST_LENGTH>(input, SHA512_Init, SHA512_Update, SHA512_Final); -}
--- a/libcommon/malikania/Hash.h Tue Mar 22 22:35:33 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -/* - * Hash.h -- hash functions - * - * Copyright (c) 2013, 2014 David Demelier <markand@malikania.fr> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _HASH_H_ -#define _HASH_H_ - -/** - * @file Hash.h - * @brief Hash functions - */ - -#include <string> - -/** - * @class Hash - * @brief Hash functions - * - * Provide support for MD5, SHA1, SHA256 and SHA512. - */ -class Hash { -private: - template <typename Context> - using Init = int (*)(Context *); - - template <typename Context> - using Update = int (*)(Context *, const void *, size_t); - - template <typename Context> - using Final = int (*)(unsigned char *, Context *); - - template <typename Context, size_t Length> - static std::string convert(const std::string &input, - Init<Context> init, - Update<Context> update, - Final<Context> finalize) - { - unsigned char digest[Length]; - char hash[Length * 2 + 1]; - - Context ctx; - init(&ctx); - update(&ctx, input.c_str(), input.length()); - finalize(digest, &ctx); - - for (unsigned long i = 0; i < Length; i++) - sprintf(&hash[i * 2], "%02x", (unsigned int)digest[i]); - - return std::string(hash); - } - -public: - /** - * Hash using MD5. - * - * @param input the input string - * @return the hashed string - */ - static std::string md5(const std::string &input); - - /** - * Hash using SHA1. - * - * @param input the input string - * @return the hashed string - */ - static std::string sha1(const std::string &input); - - /** - * Hash using SHA256. - * - * @param input the input string - * @return the hashed string - */ - static std::string sha256(const std::string &input); - - /** - * Hash using SHA512. - * - * @param input the input string - * @return the hashed string - */ - static std::string sha512(const std::string &input); -}; - -#endif // !_HASH_H_
--- a/libcommon/malikania/Id.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/Id.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_COMMON_ID_H_ -#define _MALIKANIA_COMMON_ID_H_ +#ifndef MALIKANIA_COMMON_ID_H +#define MALIKANIA_COMMON_ID_H /** * @file Id.h @@ -173,4 +173,4 @@ } // !malikania -#endif // !_MALIKANIA_ID_H_ +#endif // !MALIKANIA_COMMON_ID_H
--- a/libcommon/malikania/Js.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/Js.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_JS_H_ -#define _MALIKANIA_JS_H_ +#ifndef MALIKANIA_JS_H +#define MALIKANIA_JS_H /** * @file Js.h @@ -336,4 +336,4 @@ } // !malikania -#endif // !_MALIKANIA_JS_H_ +#endif // !MALIKANIA_JS_H
--- a/libcommon/malikania/Json.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/Json.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _JSON_H_ -#define _JSON_H_ +#ifndef MALIKANIA_JSON_H +#define MALIKANIA_JSON_H /** * @file json.h @@ -1197,4 +1197,4 @@ } // !malikania -#endif // !_JSON_H_ +#endif // !MALIKANIA_JSON_H
--- a/libcommon/malikania/ResourcesLoader.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/ResourcesLoader.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_RESOURCES_LOADER_H_ -#define _MALIKANIA_RESOURCES_LOADER_H_ +#ifndef MALIKANIA_RESOURCES_LOADER_H +#define MALIKANIA_RESOURCES_LOADER_H #include <string> #include <unordered_map> @@ -107,4 +107,4 @@ } // !malikania -#endif // !_MALIKANIA_RESOURCES_LOADER_H_ +#endif // !MALIKANIA_RESOURCES_LOADER_H
--- a/libcommon/malikania/ResourcesLocator.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/ResourcesLocator.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _MALIKANIA_RESOURCES_LOCATOR_H_ -#define _MALIKANIA_RESOURCES_LOCATOR_H_ +#ifndef MALIKANIA_RESOURCES_LOCATOR_H +#define MALIKANIA_RESOURCES_LOCATOR_H #include <string> #include <memory> @@ -79,4 +79,4 @@ } // !malikania -#endif // !_MALIKANIA_RESOURCES_LOCATOR_H_ +#endif // !MALIKANIA_RESOURCES_LOCATOR_H
--- a/libcommon/malikania/Util.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/Util.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _UTIL_H_ -#define _UTIL_H_ +#ifndef MALIKANIA_UTIL_H +#define MALIKANIA_UTIL_H /** * @file Util.h @@ -44,4 +44,4 @@ } // !malikania -#endif // !_UTIL_H_ +#endif // !MALIKANIA_UTIL_H
--- a/libcommon/malikania/backend/sdl/CommonSdl.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libcommon/malikania/backend/sdl/CommonSdl.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _COMMON_SDL_H_ -#define _COMMON_SDL_H_ +#ifndef MALIKANIA_COMMON_SDL_H +#define MALIKANIA_COMMON_SDL_H #include <SDL.h> @@ -46,4 +46,4 @@ } // !malikania -#endif // !_COMMON_SDL_H_ \ No newline at end of file +#endif // !MALIKANIA_COMMON_SDL_H
--- a/libserver/malikania/Server.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libserver/malikania/Server.h Tue Mar 22 22:50:35 2016 +0100 @@ -1,5 +1,5 @@ -#ifndef _MALIKANIA_SERVER_H_ -#define _MALIKANIA_SERVER_H_ +#ifndef MALIKANIA_SERVER_H +#define MALIKANIA_SERVER_H #include <cstdint> @@ -44,4 +44,4 @@ } // !malikania -#endif // !_MALIKANIA_SERVER_H_ +#endif // !MALIKANIA_SERVER_H
--- a/libserver/malikania/ServerApp.h Tue Mar 22 22:35:33 2016 +0100 +++ b/libserver/malikania/ServerApp.h Tue Mar 22 22:50:35 2016 +0100 @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _SERVER_APP_H_ -#define _SERVER_APP_H_ +#ifndef SERVER_APP_H +#define SERVER_APP_H #include <malikania/Game.h> #include <malikania/ResourcesLoader.h> @@ -40,4 +40,4 @@ } // !malikania -#endif // !_SERVER_APP_H_ +#endif // !SERVER_APP_H