Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2006-01-07 00:40:24 UTC
Modified files:
ChangeLog include/ircd_log.h include/s_bsd.h ircd/ircd.c
ircd/ircd_log.c ircd/umkpasswd.c
Log message:
Fix static declarations when DEBUGMODE is defined.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.766 ircu2.10/ChangeLog:1.767
--- ircu2.10/ChangeLog:1.766 Fri Jan 6 03:39:04 2006
+++ ircu2.10/ChangeLog Fri Jan 6 16:40:14 2006
@@ -1,3 +1,24 @@
+2006-01-06 Michael Poole <[EMAIL PROTECTED]>
+
+ * include/ircd_log.h (log_vwrite): Re-export this symbol, which is
+ needed for DEBUGMODE.
+
+ * include/s_bsd.h (ACCEPT_ERROR_MSG): Undeclare this symbol, which
+ is static in s_bsd.c (causing gcc 4.x to error out).
+ (PEERNAME_ERROR_MSG): Likewise.
+ (POLL_ERROR_MSG): Likewise.
+ (SELECT_ERROR_MSG): Likewise.
+ (CONNECT_ERROR_MSG): Likewise.
+ (REGISTER_ERROR_MSG): Likewise.
+
+ * include/ircd.c (debuglevel): Re-export this symbol, which is
+ needed in s_debug.c for DEBUGMODE.
+
+ * ircd/ircd_log.c (log_vwrite): Likewise.
+
+ * ircd/umkpasswd.c (crypt_mechs_root): Re-export this symbol,
+ which is always needed in s_stats.c.
+
2006-01-07 Perry Lorier <[EMAIL PROTECTED]>
* ircd/crule.c ircd/ircd.c ircd/ircd_alloc.c ircd/motd.c ircd/s_conf.c
ircd/uping.c: Convert DEBUG's to log_write's
Index: ircu2.10/include/ircd_log.h
diff -u ircu2.10/include/ircd_log.h:1.12 ircu2.10/include/ircd_log.h:1.13
--- ircu2.10/include/ircd_log.h:1.12 Fri Jan 6 03:22:29 2006
+++ ircu2.10/include/ircd_log.h Fri Jan 6 16:40:14 2006
@@ -17,7 +17,7 @@
*/
/** @file
* @brief IRC logging interface.
- * @version $Id: ircd_log.h,v 1.12 2006/01/06 11:22:29 isomer Exp $
+ * @version $Id: ircd_log.h,v 1.13 2006/01/07 00:40:14 entrope Exp $
*/
#ifndef INCLUDED_ircd_log_h
#define INCLUDED_ircd_log_h
@@ -75,6 +75,8 @@
extern void log_write(enum LogSys subsys, enum LogLevel severity,
unsigned int flags, const char *fmt, ...);
+extern void log_vwrite(enum LogSys subsys, enum LogLevel severity,
+ unsigned int flags, const char *fmt, va_list vl);
extern void log_write_kill(const struct Client *victim,
const struct Client *killer,
Index: ircu2.10/include/s_bsd.h
diff -u ircu2.10/include/s_bsd.h:1.22 ircu2.10/include/s_bsd.h:1.23
--- ircu2.10/include/s_bsd.h:1.22 Thu Dec 29 13:57:58 2005
+++ ircu2.10/include/s_bsd.h Fri Jan 6 16:40:14 2006
@@ -1,6 +1,6 @@
/** @file s_bsd.h
* @brief Wrapper functions to avoid direct use of BSD APIs.
- * @version $Id: s_bsd.h,v 1.22 2005/12/29 21:57:58 entrope Exp $
+ * @version $Id: s_bsd.h,v 1.23 2006/01/07 00:40:14 entrope Exp $
*/
#ifndef INCLUDED_s_bsd_h
#define INCLUDED_s_bsd_h
@@ -40,14 +40,8 @@
extern const char* const REUSEADDR_ERROR_MSG;
extern const char* const SOCKET_ERROR_MSG;
extern const char* const CONNLIMIT_ERROR_MSG;
-extern const char* const ACCEPT_ERROR_MSG;
-extern const char* const PEERNAME_ERROR_MSG;
-extern const char* const POLL_ERROR_MSG;
-extern const char* const SELECT_ERROR_MSG;
-extern const char* const CONNECT_ERROR_MSG;
extern const char* const SETBUFS_ERROR_MSG;
extern const char* const TOS_ERROR_MSG;
-extern const char* const REGISTER_ERROR_MSG;
extern int HighestFd;
extern struct Client** LocalClientArray;
Index: ircu2.10/ircd/ircd.c
diff -u ircu2.10/ircd/ircd.c:1.96 ircu2.10/ircd/ircd.c:1.97
--- ircu2.10/ircd/ircd.c:1.96 Fri Jan 6 03:39:04 2006
+++ ircu2.10/ircd/ircd.c Fri Jan 6 16:40:14 2006
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Entry point and other initialization functions for the daemon.
- * @version $Id: ircd.c,v 1.96 2006/01/06 11:39:04 isomer Exp $
+ * @version $Id: ircd.c,v 1.97 2006/01/07 00:40:14 entrope Exp $
*/
#include "config.h"
@@ -107,7 +107,7 @@
time_t CurrentTime; /**< Updated every time we leave
select() */
char *configfile = CPATH; /**< Server configuration file */
-static int debuglevel = -1; /**< Server debug level */
+int debuglevel = -1; /**< Server debug level */
char *debugmode = ""; /**< Server debug level */
int maxconnections = MAXCONNECTIONS; /**< Maximum number of open
files */
int maxclients = -1; /**< Maximum number of clients */
Index: ircu2.10/ircd/ircd_log.c
diff -u ircu2.10/ircd/ircd_log.c:1.23 ircu2.10/ircd/ircd_log.c:1.24
--- ircu2.10/ircd/ircd_log.c:1.23 Fri Jan 6 03:22:31 2006
+++ ircu2.10/ircd/ircd_log.c Fri Jan 6 16:40:14 2006
@@ -22,7 +22,7 @@
*/
/** @file
* @brief IRC logging implementation.
- * @version $Id: ircd_log.c,v 1.23 2006/01/06 11:22:31 isomer Exp $
+ * @version $Id: ircd_log.c,v 1.24 2006/01/07 00:40:14 entrope Exp $
*/
#include "config.h"
@@ -186,10 +186,6 @@
struct LogFile *dbfile; /**< debug file */
} logInfo = { 0, 0, LOG_USER, "ircd", 0 };
-static void
-log_vwrite(enum LogSys subsys, enum LogLevel severity, unsigned int flags,
- const char *fmt, va_list vl);
-
/** Helper routine to open a log file if needed.
* If the log file is already open, do nothing.
* @param[in,out] lf Log file to open.
@@ -365,7 +361,7 @@
* @param[in] fmt Format string for message.
* @param[in] vl Variable-length argument list for message.
*/
-static void
+void
log_vwrite(enum LogSys subsys, enum LogLevel severity, unsigned int flags,
const char *fmt, va_list vl)
{
Index: ircu2.10/ircd/umkpasswd.c
diff -u ircu2.10/ircd/umkpasswd.c:1.9 ircu2.10/ircd/umkpasswd.c:1.10
--- ircu2.10/ircd/umkpasswd.c:1.9 Fri Jan 6 03:22:31 2006
+++ ircu2.10/ircd/umkpasswd.c Fri Jan 6 16:40:14 2006
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: umkpasswd.c,v 1.9 2006/01/06 11:22:31 isomer Exp $
+ * $Id: umkpasswd.c,v 1.10 2006/01/07 00:40:14 entrope Exp $
*/
#include "config.h"
#include <unistd.h>
@@ -44,7 +44,7 @@
/* bleah, evil globals */
static umkpasswd_conf_t* umkpasswd_conf;
-static crypt_mechs_t* crypt_mechs_root;
+crypt_mechs_t* crypt_mechs_root;
int log_inassert = 0;
time_t CurrentTime;
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
