From 7e8e21a41af94ee0865c71f61c7ba2ee3d4b1b4a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Apr 2008 01:03:11 -0500 Subject: [PATCH] Remainder of irc_string.* is moved to new inline/stringops.h. --- .../inline/stringops.h | 25 ++++++++----- include/irc_string.h | 36 ------------------- modules/core/m_message.c | 2 +- modules/core/m_part.c | 2 +- modules/core/m_quit.c | 2 +- src/Makefile.in | 1 - 6 files changed, 19 insertions(+), 49 deletions(-) rename src/irc_string.c => include/inline/stringops.h (79%) delete mode 100644 include/irc_string.h diff --git a/src/irc_string.c b/include/inline/stringops.h similarity index 79% rename from src/irc_string.c rename to include/inline/stringops.h index 5b3a463..594109d 100644 --- a/src/irc_string.c +++ b/include/inline/stringops.h @@ -1,10 +1,8 @@ /* - * ircd-ratbox: A slightly useful ircd. - * irc_string.c: IRC string functions. + * charybdis: an advanced ircd. + * inline/stringops.h: inlined string operations used in a few places * - * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center - * Copyright (C) 1996-2002 Hybrid Development Team - * Copyright (C) 2002-2005 ircd-ratbox development team + * Copyright (c) 2005-2008 charybdis development team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,18 +18,22 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA - * - * $Id: irc_string.c 678 2006-02-03 20:25:01Z jilles $ */ -#include "irc_string.h" +#ifndef __INLINE_STRINGOPS_H +#define __INLINE_STRINGOPS_H -char * +/* + * strip_colour - remove colour codes from a string + * -asuffield (?) + */ +static inline char * strip_colour(char *string) { char *c = string; char *c2 = string; char *last_non_space = NULL; + /* c is source, c2 is target */ for(; c && *c; c++) switch (*c) @@ -66,8 +68,13 @@ strip_colour(char *string) last_non_space = c2; break; } + *c2 = '\0'; + if(last_non_space) *last_non_space = '\0'; + return string; } + +#endif diff --git a/include/irc_string.h b/include/irc_string.h deleted file mode 100644 index d529fc8..0000000 --- a/include/irc_string.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * ircd-ratbox: A slightly useful ircd. - * irc_string.h: A header for the ircd string functions. - * - * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center - * Copyright (C) 1996-2002 Hybrid Development Team - * Copyright (C) 2002-2004 ircd-ratbox development team - * - * This program 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * $Id: irc_string.h 3538 2007-07-26 14:21:57Z jilles $ - */ - -#ifndef INCLUDED_irc_string_h -#define INCLUDED_irc_string_h - -/* - * strip_colour - remove colour codes from a string - * -asuffield (?) - */ -char *strip_colour(char *string); - -#endif /* INCLUDED_irc_string_h */ diff --git a/modules/core/m_message.c b/modules/core/m_message.c index b934b3e..b65527e 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -43,7 +43,7 @@ #include "send.h" #include "s_newconf.h" #include "s_stats.h" -#include "irc_string.h" +#include "inline/stringops.h" static int m_message(int, const char *, struct Client *, struct Client *, int, const char **); static int m_privmsg(struct Client *, struct Client *, int, const char **); diff --git a/modules/core/m_part.c b/modules/core/m_part.c index 9b48020..64e9b35 100644 --- a/modules/core/m_part.c +++ b/modules/core/m_part.c @@ -39,7 +39,7 @@ #include "modules.h" #include "s_conf.h" #include "packet.h" -#include "irc_string.h" +#include "inline/stringops.h" static int m_part(struct Client *, struct Client *, int, const char **); diff --git a/modules/core/m_quit.c b/modules/core/m_quit.c index 346c49f..3ad321b 100644 --- a/modules/core/m_quit.c +++ b/modules/core/m_quit.c @@ -34,7 +34,7 @@ #include "parse.h" #include "modules.h" #include "s_conf.h" -#include "irc_string.h" +#include "inline/stringops.h" static int m_quit(struct Client *, struct Client *, int, const char **); static int ms_quit(struct Client *, struct Client *, int, const char **); diff --git a/src/Makefile.in b/src/Makefile.in index 88f8071..561dd95 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -65,7 +65,6 @@ SRCS = \ hash.c \ hook.c \ hostmask.c \ - irc_string.c \ irc_dictionary.c \ ircd.c \ ircd_signal.c \