legacy irc sprintf gone

extensions/m_olist.c

@@ -41,7 +41,6 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_newconf.h"
-#include "sprintf_irc.h"
 
 static int mo_olist(struct Client *, struct Client *, int parc, const char *parv[]);
 

include/client.h

@@ -39,7 +39,6 @@
 #include "res.h"
 #include "snomask.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 
 /* other structs */

include/res.h

@@ -11,7 +11,6 @@
 #include "common.h"
 #include "reslib.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 
 /* Maximum number of nameservers in /etc/resolv.conf we care about 

include/sprintf_irc.h

@@ -1,51 +0,0 @@
-/*
- *  ircd-ratbox: A slightly useful ircd.
- *  sprintf_irc.h: The irc sprintf header.
- *
- *  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: sprintf_irc.h 6 2005-09-10 01:02:21Z nenolod $
- */
-
-#ifndef SPRINTF_IRC
-#define SPRINTF_IRC
-
-#include <stdarg.h>
-
-/*=============================================================================
- * Proto types
- */
-
-
-/*
- * ircsprintf - optimized sprintf
- */
-#ifdef __GNUC__
-int ircsprintf(char *str, const char *fmt, ...) __attribute((format(printf, 2, 3)));
-int ircsnprintf(char *str, const size_t size, const char *, ...) __attribute__ ((format(printf, 3, 4)));
-#else
-int ircsprintf(char *str, const char *format, ...);
-int ircsnprintf(char *str, const size_t size, const char *, ...);
-#endif
-
-int ircvsnprintf(char *str, const size_t size, const char *fmt, va_list args);
-int ircvsprintf(char *str, const char *fmt, va_list args);
-
-#endif /* SPRINTF_IRC */

modules/core/m_join.c

@@ -39,7 +39,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "packet.h"
 
 static int m_join(struct Client *, struct Client *, int, const char **);

modules/core/m_kill.c

@@ -29,7 +29,6 @@
 #include "hash.h"		/* for find_client() */
 #include "ircd.h"
 #include "numeric.h"
-#include "sprintf_irc.h"
 #include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"

modules/core/m_mode.c

@@ -40,7 +40,6 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
-#include "sprintf_irc.h"
 #include "s_newconf.h"
 
 static int m_mode(struct Client *, struct Client *, int, const char **);

modules/core/m_quit.c

@@ -34,7 +34,6 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
-#include "sprintf_irc.h"
 
 static int m_quit(struct Client *, struct Client *, int, const char **);
 static int ms_quit(struct Client *, struct Client *, int, const char **);

modules/m_accept.c

@@ -34,7 +34,6 @@
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
-#include "sprintf_irc.h"
 #include "modules.h"
 
 static int m_accept(struct Client *, struct Client *, int, const char **);

modules/m_chghost.c

@@ -25,7 +25,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 

modules/m_dline.c

@@ -30,7 +30,6 @@
 #include "client.h"
 #include "common.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"

modules/m_encap.c

@@ -42,7 +42,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 
 static int ms_encap(struct Client *client_p, struct Client *source_p,
 		     int parc, const char *parv[]);

modules/m_ison.c

@@ -27,7 +27,6 @@
 #include "stdinc.h"
 #include "client.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_kline.c

@@ -30,7 +30,6 @@
 #include "client.h"
 #include "common.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"

modules/m_knock.c

@@ -24,7 +24,6 @@
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"

modules/m_map.c

@@ -28,7 +28,6 @@
 #include "numeric.h"
 #include "send.h"
 #include "s_conf.h"
-#include "sprintf_irc.h"
 #include "scache.h"
 
 #define USER_COL       50	/* display | Users: %d at col 50 */

modules/m_names.c

@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"

modules/m_operspy.c

@@ -42,7 +42,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 
 static int ms_operspy(struct Client *client_p, struct Client *source_p,
 		      int parc, const char *parv[]);

modules/m_restart.c

@@ -28,7 +28,6 @@
 #include "client.h"
 #include "common.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

modules/m_resv.c

@@ -37,7 +37,6 @@
 #include "s_newconf.h"
 #include "hash.h"
 #include "logger.h"
-#include "sprintf_irc.h"
 
 static int mo_resv(struct Client *, struct Client *, int, const char **);
 static int ms_resv(struct Client *, struct Client *, int, const char **);

modules/m_services.c

@@ -45,7 +45,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 

modules/m_set.c

@@ -29,7 +29,6 @@
 #include "stdinc.h"
 #include "client.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

modules/m_signon.c

@@ -44,7 +44,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 #include "s_stats.h"

modules/m_testline.c

@@ -39,7 +39,6 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "sprintf_irc.h"
 
 static int mo_testline(struct Client *, struct Client *, int, const char **);
 static int mo_testgecos(struct Client *, struct Client *, int, const char **);

modules/m_time.c

@@ -35,7 +35,6 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
-#include "sprintf_irc.h"
 
 static int m_time(struct Client *, struct Client *, int, const char **);
 static char *date(void);

modules/m_topic.c

@@ -29,7 +29,6 @@
 #include "client.h"
 #include "hash.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_user.c

@@ -35,7 +35,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "blacklist.h"
 
 static int mr_user(struct Client *, struct Client *, int, const char **);

modules/m_userhost.c

@@ -31,7 +31,6 @@
 #include "s_serv.h"
 #include "send.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"

modules/m_who.c

@@ -33,7 +33,6 @@
 #include "s_serv.h"
 #include "send.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"

modules/m_whois.c

@@ -36,7 +36,6 @@
 #include "s_serv.h"
 #include "send.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"

modules/m_xline.c

@@ -43,7 +43,6 @@
 #include "s_serv.h"
 #include "whowas.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"

src/cache.c

@@ -39,7 +39,6 @@
 #include "client.h"
 #include "hash.h"
 #include "cache.h"
-#include "sprintf_irc.h"
 #include "irc_dictionary.h"
 #include "numeric.h"
 

src/channel.c

@@ -31,7 +31,6 @@
 #include "hash.h"
 #include "hook.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"		/* captab */

src/chmode.c

@@ -32,7 +32,6 @@
 #include "hash.h"
 #include "hook.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"		/* captab */

src/client.c

@@ -32,7 +32,6 @@
 #include "common.h"
 #include "hash.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"

src/irc_dictionary.c

@@ -23,7 +23,6 @@
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
 #include "irc_string.h"
 #include "client.h"
 #include "setup.h"

src/irc_string.c

@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
 #include "irc_string.h"
 #include "client.h"
 #include "setup.h"
@@ -144,25 +143,6 @@ strtoken(char **save, char *str, const char *fs)
 	return tmp;
 }
 
-/*
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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.
- */
-
-#define SPRINTF(x) ((size_t)rb_sprintf x)
-
 char *
 strip_colour(char *string)
 {

src/ircd.c

@@ -36,7 +36,6 @@
 #include "hash.h"
 #include "irc_string.h"
 #include "ircd_signal.h"
-#include "sprintf_irc.h"
 #include "msg.h"		/* msgtab */
 #include "hostmask.h"
 #include "numeric.h"

src/listener.c

@@ -29,7 +29,6 @@
 #include "listener.h"
 #include "client.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

src/logger.c

@@ -38,7 +38,6 @@
 #include "ircd_defs.h"
 #include "logger.h"
 #include "s_conf.h"
-#include "sprintf_irc.h"
 #include "send.h"
 #include "client.h"
 #include "s_serv.h"

src/modules.c

@@ -38,7 +38,6 @@
 #include "parse.h"
 #include "ircd_defs.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 
 
 

src/newconf.c

@@ -11,7 +11,6 @@
 
 #include "newconf.h"
 #include "ircd_defs.h"
-#include "sprintf_irc.h"
 #include "common.h"
 #include "logger.h"
 #include "s_conf.h"

src/parse.c

@@ -32,7 +32,6 @@
 #include "common.h"
 #include "hash.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "logger.h"

src/res.c

@@ -32,7 +32,6 @@
 #include "res.h"
 #include "reslib.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "numeric.h"
 #include "client.h" /* SNO_* */
 

src/reslib.c

@@ -87,7 +87,6 @@
 #include "res.h"
 #include "reslib.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 
 #define NS_TYPE_ELT             0x40 /* EDNS0 extended label type */
 #define DNS_LABELTYPE_BITSTRING 0x41

src/s_auth.c

@@ -40,7 +40,6 @@
 #include "client.h"
 #include "common.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"

src/s_conf.c

@@ -36,7 +36,6 @@
 #include "common.h"
 #include "hash.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "listener.h"
 #include "hostmask.h"

src/s_newconf.c

@@ -43,7 +43,6 @@
 #include "hostmask.h"
 #include "newconf.h"
 #include "hash.h"
-#include "sprintf_irc.h"
 #include "irc_dictionary.h"
 
 rb_dlink_list shared_conf_list;

src/s_serv.c

@@ -36,7 +36,6 @@
 #include "common.h"
 #include "hash.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

src/s_user.c

@@ -32,7 +32,6 @@
 #include "common.h"
 #include "hash.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "listener.h"
 #include "msg.h"

src/send.c

@@ -34,7 +34,6 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
-#include "sprintf_irc.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "logger.h"

unsupported/m_force.c

@@ -35,7 +35,6 @@
 #include "client.h"
 #include "common.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"