From 712a0e5ff36e5ba052c5d1accf5f5943be4a6e8a Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Thu, 16 May 2013 02:23:45 +0200 Subject: Get rid of strlcpy(), strlcat(), charlcat() and charremove() --- include/channels.h | 2 +- include/inspstring.h | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'include') diff --git a/include/channels.h b/include/channels.h index 56e1a5a49..b71da1570 100644 --- a/include/channels.h +++ b/include/channels.h @@ -279,7 +279,7 @@ class CoreExport Channel : public Extensible, public InviteBase * otherwise it is replaced with '<KEY>' * @return The channel mode string */ - char* ChanModes(bool showkey); + const char* ChanModes(bool showkey); /** Spool the NAMES list for this channel to the given user * @param user The user to spool the NAMES list to diff --git a/include/inspstring.h b/include/inspstring.h index 7a433427a..6864245b0 100644 --- a/include/inspstring.h +++ b/include/inspstring.h @@ -24,26 +24,6 @@ #include "config.h" #include -#ifndef HAS_STRLCPY -/** strlcpy() implementation for systems that don't have it (linux) */ -CoreExport size_t strlcpy(char *dst, const char *src, size_t siz); -/** strlcat() implementation for systems that don't have it (linux) */ -CoreExport size_t strlcat(char *dst, const char *src, size_t siz); -#endif - -/** charlcat() will append one character to a string using the same - * safety scemantics as strlcat(). - * @param x The string to operate on - * @param y the character to append to the end of x - * @param z The maximum allowed length for z including null terminator - */ -CoreExport int charlcat(char* x,char y,int z); -/** charremove() will remove all instances of a character from a string - * @param mp The string to operate on - * @param remove The character to remove - */ -CoreExport bool charremove(char* mp, char remove); - /** Binary to hexadecimal conversion */ CoreExport std::string BinToHex(const std::string& data); /** Base64 encode */ -- cgit v1.2.3