X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspstring.h;h=abf8d9cf36e46813b0974334af0e3a3bae32a0ca;hb=e4a590c7926b4b9454093f88b2d4d1616b717df2;hp=bb03bc2edbe5f2480c2df745321a06629c5b881f;hpb=f1271614679843191bb247c0db2716acb5ac0e4b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/inspstring.h b/include/inspstring.h index bb03bc2ed..abf8d9cf3 100644 --- a/include/inspstring.h +++ b/include/inspstring.h @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -16,7 +16,7 @@ // This (inspircd_config) is needed as inspstring doesn't pull in the central header #include "inspircd_config.h" -#include +#include //#include #ifndef HAS_STRLCPY @@ -39,19 +39,8 @@ CoreExport int charlcat(char* x,char y,int z); */ CoreExport bool charremove(char* mp, char remove); -/** strnewdup() is an implemenetation of strdup() which calls operator new - * rather than malloc to allocate the new string, therefore allowing it to - * be hooked into the C++ memory manager, and freed with operator delete. - * This is required for windows, where we override operators new and delete - * to allow for global allocation between modules and the core. - */ -inline char * strnewdup(const char * s1) -{ - size_t len = strlen(s1) + 1; - char * p = new char[len]; - memcpy(p, s1, len); - return p; -} +/** Binary to hexadecimal conversion */ +std::string BinToHex(const std::string& data); #endif