Fix a bunch of really obvious unnecessary includes.

[user/henk/code/inspircd.git] / include / inspstring.h

diff --git a/include/inspstring.h b/include/inspstring.h
index 89abed94f4a8433498c2422fdb94810a97c3c5da..17093eb7cfbb49a5646ed80e0d4d98399287147f 100644 (file)
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -1 +1,60 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#ifndef __IN_INSPSTRING_H\r#define __IN_INSPSTRING_H\r\r#include "inspircd_config.h"\r#include <string.h>\r#include <cstddef>\r\r#ifndef HAS_STRLCPY\r/** strlcpy() implementation for systems that don't have it (linux) */\rCoreExport size_t strlcpy(char *dst, const char *src, size_t siz);\r/** strlcat() implementation for systems that don't have it (linux) */\rCoreExport size_t strlcat(char *dst, const char *src, size_t siz);\r#endif\r\r/** charlcat() will append one character to a string using the same\r * safety scemantics as strlcat().\r * @param x The string to operate on\r * @param y the character to append to the end of x\r * @param z The maximum allowed length for z including null terminator\r */\rCoreExport int charlcat(char* x,char y,int z);\r/** charremove() will remove all instances of a character from a string\r * @param mp The string to operate on\r * @param remove The character to remove\r */\rCoreExport bool charremove(char* mp, char remove);\r\r/** strnewdup() is an implemenetation of strdup() which calls operator new\r * rather than malloc to allocate the new string, therefore allowing it to\r * be hooked into the C++ memory manager, and freed with operator delete.\r * This is required for windows, where we override operators new and delete\r * to allow for global allocation between modules and the core.\r */\rinline char * strnewdup(const char * s1)\r{\r     size_t len = strlen(s1) + 1;\r   char * p = new char[len];\r      memcpy(p, s1, len);\r    return p;\r}\r\r#endif\r\r
\ No newline at end of file
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+#include <cstring>
+
+/** Sets ret to the formatted string. last is the last parameter before ..., and format is the format in printf-style */
+#define VAFORMAT(ret, last, format) \
+       do { \
+       va_list _vaList; \
+       va_start(_vaList, last); \
+       ret.assign(InspIRCd::Format(_vaList, format)); \
+       va_end(_vaList); \
+       } while (false);
+
+/** Compose a hex string from raw data.
+ * @param raw The raw data to compose hex from (can be NULL if rawsize is 0)
+ * @param rawsize The size of the raw data buffer
+ * @return The hex string
+ */
+CoreExport std::string BinToHex(const void* raw, size_t rawsize);
+
+/** Base64 encode */
+CoreExport std::string BinToBase64(const std::string& data, const char* table = NULL, char pad = 0);
+/** Base64 decode */
+CoreExport std::string Base64ToBin(const std::string& data, const char* table = NULL);
+
+/** Compose a hex string from the data in a std::string.
+ * @param data The data to compose hex from
+ * @return The hex string.
+ */
+inline std::string BinToHex(const std::string& data)
+{
+       return BinToHex(data.data(), data.size());
+}