albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unnecessary #define of "LOCAL", now use plain C "static" instead.

This commit is contained in:
Alexander Barton 2005-07-31 20:13:07 +00:00
parent b61407713d
commit 77f54693ef
20 changed files with 194 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,7 @@
ngIRCd CVSHEAD
- Removed unnecessary #define of "LOCAL", now use plain C "static" instead.
- Channel topics are no longer limited to 127 characters: now the only limit
is the maximum length of an IRC command, i. e. 512 bytes (in pratice, this
limits the topic to about 490 characters due to protocol overhead).
@ -622,4 +623,4 @@ ngIRCd 0.0.1, 31.12.2001
--
$Id: ChangeLog,v 1.283 2005/07/30 21:00:19 alex Exp $
$Id: ChangeLog,v 1.284 2005/07/31 20:13:07 alex Exp $

30
src/ngircd/channel.c
View File

@ -17,7 +17,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: channel.c,v 1.52 2005/07/28 16:23:55 fw Exp $";
static char UNUSED id[] = "$Id: channel.c,v 1.53 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -50,16 +50,16 @@ static char UNUSED id[] = "$Id: channel.c,v 1.52 2005/07/28 16:23:55 fw Exp $";
#define REMOVE_KICK 2
LOCAL CHANNEL *My_Channels;
LOCAL CL2CHAN *My_Cl2Chan;
static CHANNEL *My_Channels;
static CL2CHAN *My_Cl2Chan;
LOCAL CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
LOCAL CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
LOCAL bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
LOCAL CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
LOCAL CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
LOCAL bool Delete_Channel PARAMS(( CHANNEL *Chan ));
static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
GLOBAL void
@ -745,7 +745,7 @@ Channel_Create( char *Name )
} /* Channel_Create */
LOCAL CL2CHAN *
static CL2CHAN *
Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
{
CL2CHAN *cl2chan;
@ -763,7 +763,7 @@ Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
} /* Get_Cl2Chan */
LOCAL CL2CHAN *
static CL2CHAN *
Add_Client( CHANNEL *Chan, CLIENT *Client )
{
CL2CHAN *cl2chan;
@ -792,7 +792,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
} /* Add_Client */
LOCAL bool
static bool
Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer )
{
CL2CHAN *cl2chan, *last_cl2chan;
@ -855,14 +855,14 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re
} /* Remove_Client */
LOCAL CL2CHAN *
static CL2CHAN *
Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
{
return Get_Next_Cl2Chan( My_Cl2Chan, Client, Chan );
} /* Get_First_Cl2Chan */
LOCAL CL2CHAN *
static CL2CHAN *
Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
{
CL2CHAN *cl2chan;
@ -880,7 +880,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
} /* Get_Next_Cl2Chan */
LOCAL bool
static bool
Delete_Channel( CHANNEL *Chan )
{
/* Channel-Struktur loeschen */

30
src/ngircd/client.c
View File

@ -17,7 +17,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: client.c,v 1.84 2005/06/12 16:39:42 alex Exp $";
static char UNUSED id[] = "$Id: client.c,v 1.85 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -50,19 +50,19 @@ static char UNUSED id[] = "$Id: client.c,v 1.84 2005/06/12 16:39:42 alex Exp $";
#define GETID_LEN (CLIENT_NICK_LEN-1) + 1 + (CLIENT_USER_LEN-1) + 1 + (CLIENT_HOST_LEN-1) + 1
LOCAL CLIENT *This_Server, *My_Clients;
LOCAL char GetID_Buffer[GETID_LEN];
static CLIENT *This_Server, *My_Clients;
static char GetID_Buffer[GETID_LEN];
LOCAL WHOWAS My_Whowas[MAX_WHOWAS];
LOCAL int Last_Whowas = -1;
static WHOWAS My_Whowas[MAX_WHOWAS];
static int Last_Whowas = -1;
LOCAL long Count PARAMS(( CLIENT_TYPE Type ));
LOCAL long MyCount PARAMS(( CLIENT_TYPE Type ));
static long Count PARAMS(( CLIENT_TYPE Type ));
static long MyCount PARAMS(( CLIENT_TYPE Type ));
LOCAL CLIENT *New_Client_Struct PARAMS(( void ));
LOCAL void Generate_MyToken PARAMS(( CLIENT *Client ));
LOCAL void Adjust_Counters PARAMS(( CLIENT *Client ));
static CLIENT *New_Client_Struct PARAMS(( void ));
static void Generate_MyToken PARAMS(( CLIENT *Client ));
static void Adjust_Counters PARAMS(( CLIENT *Client ));
#ifndef Client_DestroyNow
GLOBAL void Client_DestroyNow PARAMS((CLIENT *Client ));
@ -1035,7 +1035,7 @@ Client_StartTime(CLIENT *Client)
} /* Client_Uptime */
LOCAL long
static long
Count( CLIENT_TYPE Type )
{
CLIENT *c;
@ -1052,7 +1052,7 @@ Count( CLIENT_TYPE Type )
} /* Count */
LOCAL long
static long
MyCount( CLIENT_TYPE Type )
{
CLIENT *c;
@ -1069,7 +1069,7 @@ MyCount( CLIENT_TYPE Type )
} /* MyCount */
LOCAL CLIENT *
static CLIENT *
New_Client_Struct( void )
{
/* Neue CLIENT-Struktur pre-initialisieren */
@ -1096,7 +1096,7 @@ New_Client_Struct( void )
} /* New_Client */
LOCAL void
static void
Generate_MyToken( CLIENT *Client )
{
CLIENT *c;
@ -1120,7 +1120,7 @@ Generate_MyToken( CLIENT *Client )
} /* Generate_MyToken */
LOCAL void
static void
Adjust_Counters( CLIENT *Client )
{
long count;

56
src/ngircd/conf.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: conf.c,v 1.82 2005/07/29 09:29:47 fw Exp $";
static char UNUSED id[] = "$Id: conf.c,v 1.83 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -51,26 +51,26 @@ static char UNUSED id[] = "$Id: conf.c,v 1.82 2005/07/29 09:29:47 fw Exp $";
#include "conf.h"
LOCAL bool Use_Log = true;
LOCAL CONF_SERVER New_Server;
LOCAL int New_Server_Idx;
static bool Use_Log = true;
static CONF_SERVER New_Server;
static int New_Server_Idx;
LOCAL void Set_Defaults PARAMS(( bool InitServers ));
LOCAL void Read_Config PARAMS(( void ));
LOCAL void Validate_Config PARAMS(( bool TestOnly ));
static void Set_Defaults PARAMS(( bool InitServers ));
static void Read_Config PARAMS(( void ));
static void Validate_Config PARAMS(( bool TestOnly ));
LOCAL void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
LOCAL void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
LOCAL void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg ));
LOCAL void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg ));
static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
static void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg ));
static void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg ));
LOCAL void Config_Error PARAMS(( const int Level, const char *Format, ... ));
static void Config_Error PARAMS(( const int Level, const char *Format, ... ));
LOCAL void Config_Error_NaN PARAMS(( const int LINE, const char *Value ));
LOCAL void Config_Error_TooLong PARAMS(( const int LINE, const char *Value ));
static void Config_Error_NaN PARAMS(( const int LINE, const char *Value ));
static void Config_Error_TooLong PARAMS(( const int LINE, const char *Value ));
LOCAL void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
static void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
static void
@ -387,7 +387,7 @@ Conf_AddServer( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd
} /* Conf_AddServer */
LOCAL void
static void
Set_Defaults( bool InitServers )
{
/* Initialize configuration variables with default values. */
@ -435,7 +435,7 @@ Set_Defaults( bool InitServers )
} /* Set_Defaults */
LOCAL void
static void
Read_Config( void )
{
/* Read configuration file. */
@ -613,7 +613,7 @@ Read_Config( void )
} /* Read_Config */
LOCAL bool
static bool
Check_ArgIsTrue( const char *Arg )
{
if( strcasecmp( Arg, "yes" ) == 0 ) return true;
@ -624,7 +624,7 @@ Check_ArgIsTrue( const char *Arg )
} /* Check_ArgIsTrue */
LOCAL void
static void
Handle_GLOBAL( int Line, char *Var, char *Arg )
{
struct passwd *pwd;
@ -834,7 +834,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
} /* Handle_GLOBAL */
LOCAL void
static void
Handle_OPERATOR( int Line, char *Var, char *Arg )
{
unsigned int opercount;
@ -881,7 +881,7 @@ Handle_OPERATOR( int Line, char *Var, char *Arg )
} /* Handle_OPERATOR */
LOCAL void
static void
Handle_SERVER( int Line, char *Var, char *Arg )
{
long port;
@ -943,7 +943,7 @@ Handle_SERVER( int Line, char *Var, char *Arg )
} /* Handle_SERVER */
LOCAL void
static void
Handle_CHANNEL( int Line, char *Var, char *Arg )
{
assert( Line > 0 );
@ -977,7 +977,7 @@ Handle_CHANNEL( int Line, char *Var, char *Arg )
} /* Handle_CHANNEL */
LOCAL void
static void
Validate_Config( bool Configtest )
{
/* Validate configuration settings. */
@ -1041,22 +1041,22 @@ Validate_Config( bool Configtest )
} /* Validate_Config */
LOCAL void
static void
Config_Error_TooLong ( const int Line, const char *Item )
{
Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" too long!", NGIRCd_ConfFile, Line, Item );
}
LOCAL void
static void
Config_Error_NaN( const int Line, const char *Item )
{
Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" is not a number!", NGIRCd_ConfFile, Line, Item );
}
#ifdef PROTOTYPES
LOCAL void Config_Error( const int Level, const char *Format, ... )
static void Config_Error( const int Level, const char *Format, ... )
#else
LOCAL void Config_Error( Level, Format, va_alist )
static void Config_Error( Level, Format, va_alist )
const int Level;
const char *Format;
va_dcl
@ -1085,7 +1085,7 @@ va_dcl
} /* Config_Error */
LOCAL void
static void
Init_Server_Struct( CONF_SERVER *Server )
{
/* Initialize server configuration structur to default values */

56
src/ngircd/conn.c
View File

@ -17,7 +17,7 @@
#include "portab.h"
#include "io.h"
static char UNUSED id[] = "$Id: conn.c,v 1.167 2005/07/29 09:29:47 fw Exp $";
static char UNUSED id[] = "$Id: conn.c,v 1.168 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -82,19 +82,19 @@ static char UNUSED id[] = "$Id: conn.c,v 1.167 2005/07/29 09:29:47 fw Exp $";
#define SERVER_WAIT (NONE - 1)
LOCAL bool Handle_Write PARAMS(( CONN_ID Idx ));
LOCAL int New_Connection PARAMS(( int Sock ));
LOCAL CONN_ID Socket2Index PARAMS(( int Sock ));
LOCAL void Read_Request PARAMS(( CONN_ID Idx ));
LOCAL bool Handle_Buffer PARAMS(( CONN_ID Idx ));
LOCAL void Check_Connections PARAMS(( void ));
LOCAL void Check_Servers PARAMS(( void ));
LOCAL void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
LOCAL bool Init_Socket PARAMS(( int Sock ));
LOCAL void New_Server PARAMS(( int Server, CONN_ID Idx ));
LOCAL void Simple_Message PARAMS(( int Sock, char *Msg ));
LOCAL int Count_Connections PARAMS(( struct sockaddr_in addr ));
LOCAL int NewListener PARAMS(( const UINT16 Port ));
static bool Handle_Write PARAMS(( CONN_ID Idx ));
static int New_Connection PARAMS(( int Sock ));
static CONN_ID Socket2Index PARAMS(( int Sock ));
static void Read_Request PARAMS(( CONN_ID Idx ));
static bool Handle_Buffer PARAMS(( CONN_ID Idx ));
static void Check_Connections PARAMS(( void ));
static void Check_Servers PARAMS(( void ));
static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
static bool Init_Socket PARAMS(( int Sock ));
static void New_Server PARAMS(( int Server, CONN_ID Idx ));
static void Simple_Message PARAMS(( int Sock, char *Msg ));
static int Count_Connections PARAMS(( struct sockaddr_in addr ));
static int NewListener PARAMS(( const UINT16 Port ));
static array My_Listeners;
@ -198,7 +198,7 @@ cb_clientserver(int sock, short what)
}
LOCAL void
static void
FreeRes_stat( CONNECTION *c )
{
assert( c != NULL );
@ -358,7 +358,7 @@ Conn_ExitListeners( void )
/* return new listening port file descriptor or -1 on failure */
LOCAL int
static int
NewListener( const UINT16 Port )
{
/* Create new listening socket on specified port */
@ -843,7 +843,7 @@ Conn_SyncServerStruct( void )
} /* SyncServerStruct */
LOCAL bool
static bool
Handle_Write( CONN_ID Idx )
{
/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
@ -894,7 +894,7 @@ Handle_Write( CONN_ID Idx )
} /* Handle_Write */
LOCAL int
static int
New_Connection( int Sock )
{
/* Neue Client-Verbindung von Listen-Socket annehmen und
@ -1042,7 +1042,7 @@ New_Connection( int Sock )
} /* New_Connection */
LOCAL CONN_ID
static CONN_ID
Socket2Index( int Sock )
{
/* zum Socket passende Connection suchen */
@ -1066,7 +1066,7 @@ Socket2Index( int Sock )
} /* Socket2Index */
LOCAL void
static void
Read_Request( CONN_ID Idx )
{
/* Daten von Socket einlesen und entsprechend behandeln.
@ -1135,7 +1135,7 @@ Read_Request( CONN_ID Idx )
} /* Read_Request */
LOCAL bool
static bool
Handle_Buffer( CONN_ID Idx )
{
/* Handle Data in Connections Read-Buffer.
@ -1246,7 +1246,7 @@ Handle_Buffer( CONN_ID Idx )
} /* Handle_Buffer */
LOCAL void
static void
Check_Connections( void )
{
/* check if connections are alive. if not, play PING-PONG first.
@ -1296,7 +1296,7 @@ Check_Connections( void )
} /* Check_Connections */
LOCAL void
static void
Check_Servers( void )
{
/* Check if we can establish further server links */
@ -1364,7 +1364,7 @@ Check_Servers( void )
} /* Check_Servers */
LOCAL void
static void
New_Server( int Server, CONN_ID Idx )
{
/* Establish new server link */
@ -1456,7 +1456,7 @@ out:
} /* New_Server */
LOCAL void
static void
Init_Conn_Struct( CONN_ID Idx )
{
time_t now = time( NULL );
@ -1469,7 +1469,7 @@ Init_Conn_Struct( CONN_ID Idx )
} /* Init_Conn_Struct */
LOCAL bool
static bool
Init_Socket( int Sock )
{
/* Initialize socket (set options) */
@ -1649,7 +1649,7 @@ try_resolve:
} /* Read_Resolver_Result */
LOCAL void
static void
Simple_Message( int Sock, char *Msg )
{
char buf[COMMAND_LEN];
@ -1665,7 +1665,7 @@ Simple_Message( int Sock, char *Msg )
} /* Simple_Error */
LOCAL int
static int
Count_Connections( struct sockaddr_in addr_in )
{
int i, cnt;

6
src/ngircd/hash.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: hash.c,v 1.11 2005/03/19 18:43:48 fw Exp $";
static char UNUSED id[] = "$Id: hash.c,v 1.12 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -27,7 +27,7 @@ static char UNUSED id[] = "$Id: hash.c,v 1.11 2005/03/19 18:43:48 fw Exp $";
#include "hash.h"
LOCAL UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
static UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
GLOBAL UINT32
@ -72,7 +72,7 @@ Hash( char *String )
} /* mix */
LOCAL UINT32
static UINT32
jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval )
{
/* k: the key

10
src/ngircd/irc-login.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: irc-login.c,v 1.45 2005/07/28 16:23:55 fw Exp $";
static char UNUSED id[] = "$Id: irc-login.c,v 1.46 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -41,8 +41,8 @@ static char UNUSED id[] = "$Id: irc-login.c,v 1.45 2005/07/28 16:23:55 fw Exp $"
#include "irc-login.h"
LOCAL bool Hello_User PARAMS(( CLIENT *Client ));
LOCAL void Kill_Nick PARAMS(( char *Nick, char *Reason ));
static bool Hello_User PARAMS(( CLIENT *Client ));
static void Kill_Nick PARAMS(( char *Nick, char *Reason ));
GLOBAL bool
@ -497,7 +497,7 @@ IRC_PONG( CLIENT *Client, REQUEST *Req )
} /* IRC_PONG */
LOCAL bool
static bool
Hello_User( CLIENT *Client )
{
#ifdef CVSDATE
@ -557,7 +557,7 @@ Hello_User( CLIENT *Client )
} /* Hello_User */
LOCAL void
static void
Kill_Nick( char *Nick, char *Reason )
{
REQUEST r;

30
src/ngircd/irc-mode.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: irc-mode.c,v 1.43 2005/06/17 19:14:58 fw Exp $";
static char UNUSED id[] = "$Id: irc-mode.c,v 1.44 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -38,16 +38,16 @@ static char UNUSED id[] = "$Id: irc-mode.c,v 1.43 2005/06/17 19:14:58 fw Exp $";
#include "irc-mode.h"
LOCAL bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ));
LOCAL bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ));
static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ));
static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ));
LOCAL bool Add_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
LOCAL bool Add_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
static bool Add_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
static bool Add_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
LOCAL bool Del_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
LOCAL bool Del_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
static bool Del_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
static bool Del_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
LOCAL bool Send_ListChange PARAMS(( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Mask ));
static bool Send_ListChange PARAMS(( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Mask ));
GLOBAL bool
@ -83,7 +83,7 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
} /* IRC_MODE */
LOCAL bool
static bool
Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
{
/* Handle client mode requests */
@ -236,7 +236,7 @@ client_exit:
} /* Client_Mode */
LOCAL bool
static bool
Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
{
/* Handle channel and channel-user modes */
@ -627,7 +627,7 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
} /* IRC_AWAY */
LOCAL bool
static bool
Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
char *mask;
@ -649,7 +649,7 @@ Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
} /* Add_Invite */
LOCAL bool
static bool
Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
char *mask;
@ -671,7 +671,7 @@ Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
} /* Add_Ban */
LOCAL bool
static bool
Del_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
char *mask;
@ -686,7 +686,7 @@ Del_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
} /* Del_Invite */
LOCAL bool
static bool
Del_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
char *mask;
@ -701,7 +701,7 @@ Del_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
} /* Del_Ban */
LOCAL bool
static bool
Send_ListChange( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Mask )
{
/* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */

4
src/ngircd/irc-oper.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: irc-oper.c,v 1.23 2005/07/11 14:11:35 fw Exp $";
static char UNUSED id[] = "$Id: irc-oper.c,v 1.24 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -37,7 +37,7 @@ static char UNUSED id[] = "$Id: irc-oper.c,v 1.23 2005/07/11 14:11:35 fw Exp $";
#include "irc-oper.h"
LOCAL bool
static bool
Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
{
Log( LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", Client_Mask( Client ),

6
src/ngircd/irc-write.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: irc-write.c,v 1.18 2005/04/27 07:39:18 alex Exp $";
static char UNUSED id[] = "$Id: irc-write.c,v 1.19 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -39,7 +39,7 @@ static char UNUSED id[] = "$Id: irc-write.c,v 1.18 2005/04/27 07:39:18 alex Exp
#define SEND_TO_SERVER 2
LOCAL char *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
static char *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
#ifdef PROTOTYPES
@ -414,7 +414,7 @@ IRC_SetPenalty( CLIENT *Client, int Seconds )
} /* IRC_SetPenalty */
LOCAL char *
static char *
Get_Prefix( CLIENT *Target, CLIENT *Client )
{
assert( Target != NULL );

6
src/ngircd/irc.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: irc.c,v 1.126 2005/04/18 15:44:39 alex Exp $";
static char UNUSED id[] = "$Id: irc.c,v 1.127 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -38,7 +38,7 @@ static char UNUSED id[] = "$Id: irc.c,v 1.126 2005/04/18 15:44:39 alex Exp $";
#include "irc.h"
LOCAL char *Option_String PARAMS(( CONN_ID Idx ));
static char *Option_String PARAMS(( CONN_ID Idx ));
GLOBAL bool
@ -325,7 +325,7 @@ IRC_HELP( CLIENT *Client, REQUEST *Req )
} /* IRC_HELP */
LOCAL char *
static char *
Option_String( CONN_ID Idx )
{
static char option_txt[8];

16
src/ngircd/lists.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: lists.c,v 1.17 2005/03/19 18:43:49 fw Exp $";
static char UNUSED id[] = "$Id: lists.c,v 1.18 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -48,13 +48,13 @@ typedef struct _C2C
} C2C;
LOCAL C2C *My_Invites, *My_Bans;
static C2C *My_Invites, *My_Bans;
LOCAL C2C *New_C2C PARAMS(( char *Mask, CHANNEL *Chan, bool OnlyOnce ));
static C2C *New_C2C PARAMS(( char *Mask, CHANNEL *Chan, bool OnlyOnce ));
LOCAL bool Check_List PARAMS(( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan ));
LOCAL bool Already_Registered PARAMS(( C2C *Cl2Chan, char *Mask, CHANNEL *Chan ));
static bool Check_List PARAMS(( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan ));
static bool Already_Registered PARAMS(( C2C *Cl2Chan, char *Mask, CHANNEL *Chan ));
@ -407,7 +407,7 @@ Lists_MakeMask( char *Pattern )
} /* Lists_MakeMask */
LOCAL C2C *
static C2C *
New_C2C( char *Mask, CHANNEL *Chan, bool OnlyOnce )
{
C2C *c2c;
@ -431,7 +431,7 @@ New_C2C( char *Mask, CHANNEL *Chan, bool OnlyOnce )
} /* New_C2C */
LOCAL bool
static bool
Check_List( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan )
{
C2C *c2c, *last;
@ -470,7 +470,7 @@ Check_List( C2C **Cl2Chan, CLIENT *Client, CHANNEL *Chan )
} /* Check_List */
LOCAL bool
static bool
Already_Registered( C2C *List, char *Mask, CHANNEL *Chan )
{
C2C *c2c;

12
src/ngircd/log.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: log.c,v 1.57 2005/06/24 19:55:10 alex Exp $";
static char UNUSED id[] = "$Id: log.c,v 1.58 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -44,15 +44,15 @@ static char UNUSED id[] = "$Id: log.c,v 1.57 2005/06/24 19:55:10 alex Exp $";
#include "log.h"
LOCAL char Init_Txt[127];
LOCAL bool Is_Daemon;
static char Init_Txt[127];
static bool Is_Daemon;
#ifdef DEBUG
LOCAL char Error_File[FNAME_LEN];
static char Error_File[FNAME_LEN];
#endif
LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
static void Wall_ServerNotice PARAMS(( char *Msg ));
GLOBAL void
@ -302,7 +302,7 @@ va_dcl
} /* Log_Resolver */
LOCAL void
static void
Wall_ServerNotice( char *Msg )
{
/* Server-Notice an entsprechende User verschicken */

10
src/ngircd/match.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: match.c,v 1.3 2005/03/19 18:43:49 fw Exp $";
static char UNUSED id[] = "$Id: match.c,v 1.4 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -32,8 +32,8 @@ static char UNUSED id[] = "$Id: match.c,v 1.3 2005/03/19 18:43:49 fw Exp $";
*/
LOCAL int Matche PARAMS(( char *p, char *t ));
LOCAL int Matche_After_Star PARAMS(( char *p, char *t ));
static int Matche PARAMS(( char *p, char *t ));
static int Matche_After_Star PARAMS(( char *p, char *t ));
#define MATCH_PATTERN 6 /* bad pattern */
@ -53,7 +53,7 @@ Match( char *Pattern, char *String )
} /* Match */
LOCAL int
static int
Matche( char *p, char *t )
{
register char range_start, range_end;
@ -200,7 +200,7 @@ Matche( char *p, char *t )
} /* Matche */
LOCAL int
static int
Matche_After_Star( char *p, char *t )
{
register int nextp, match = 0;

40
src/ngircd/ngircd.c
View File

@ -12,7 +12,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: ngircd.c,v 1.107 2005/07/10 21:07:22 fw Exp $";
static char UNUSED id[] = "$Id: ngircd.c,v 1.108 2005/07/31 20:13:08 alex Exp $";
/**
* @file
@ -56,20 +56,20 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.107 2005/07/10 21:07:22 fw Exp $";
#include "ngircd.h"
LOCAL void Initialize_Signal_Handler PARAMS(( void ));
LOCAL void Signal_Handler PARAMS(( int Signal ));
static void Initialize_Signal_Handler PARAMS(( void ));
static void Signal_Handler PARAMS(( int Signal ));
LOCAL void Show_Version PARAMS(( void ));
LOCAL void Show_Help PARAMS(( void ));
static void Show_Version PARAMS(( void ));
static void Show_Help PARAMS(( void ));
LOCAL void Pidfile_Create PARAMS(( long ));
LOCAL void Pidfile_Delete PARAMS(( void ));
static void Pidfile_Create PARAMS(( long ));
static void Pidfile_Delete PARAMS(( void ));
LOCAL void Fill_Version PARAMS(( void ));
static void Fill_Version PARAMS(( void ));
LOCAL void Setup_FDStreams PARAMS(( void ));
static void Setup_FDStreams PARAMS(( void ));
LOCAL bool NGIRCd_Init PARAMS(( bool ));
static bool NGIRCd_Init PARAMS(( bool ));
/**
* The main() function of ngIRCd.
@ -341,7 +341,7 @@ main( int argc, const char *argv[] )
* further usage, for example by the IRC command VERSION and the --version
* command line switch.
*/
LOCAL void
static void
Fill_Version( void )
{
NGIRCd_VersionAddition[0] = '\0';
@ -458,7 +458,7 @@ NGIRCd_Rehash( void )
/**
* Initialize the signal handler.
*/
LOCAL void
static void
Initialize_Signal_Handler( void )
{
/* Signal-Handler initialisieren: einige Signale
@ -511,7 +511,7 @@ Initialize_Signal_Handler( void )
* user and/or the system to it. For example SIGTERM and SIGHUP.
* @param Signal Number of the signal to handle.
*/
LOCAL void
static void
Signal_Handler( int Signal )
{
switch( Signal )
@ -542,7 +542,7 @@ Signal_Handler( int Signal )
/**
* Display copyright and version information of ngIRCd on the console.
*/
LOCAL void
static void
Show_Version( void )
{
puts( NGIRCd_Version );
@ -558,7 +558,7 @@ Show_Version( void )
* This help depends on the configuration of the executable and only shows
* options that are actually enabled.
*/
LOCAL void
static void
Show_Help( void )
{
#ifdef DEBUG
@ -579,7 +579,7 @@ Show_Help( void )
/**
* Delete the file containing the process ID (PID).
*/
LOCAL void
static void
Pidfile_Delete( void )
{
/* Pidfile configured? */
@ -598,7 +598,7 @@ Pidfile_Delete( void )
* Create the file containing the process ID of ngIRCd ("PID file").
* @param pid The process ID to be stored in this file.
*/
LOCAL void
static void
Pidfile_Create( long pid )
{
int pidfd;
@ -635,7 +635,7 @@ Pidfile_Create( long pid )
/**
* Redirect stdin, stdout and stderr to apropriate file handles.
*/
LOCAL void
static void
Setup_FDStreams( void )
{
int fd;
@ -660,7 +660,7 @@ Setup_FDStreams( void )
} /* Setup_FDStreams */
LOCAL bool
static bool
NGIRCd_getNobodyID(unsigned int *uid, unsigned int *gid )
{
struct passwd *pwd;
@ -679,7 +679,7 @@ NGIRCd_getNobodyID(unsigned int *uid, unsigned int *gid )
}
LOCAL bool
static bool
NGIRCd_Init( bool NGIRCd_NoDaemon )
{
static bool initialized;

22
src/ngircd/parse.c
View File

@ -12,7 +12,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: parse.c,v 1.64 2005/07/22 21:31:05 alex Exp $";
static char UNUSED id[] = "$Id: parse.c,v 1.65 2005/07/31 20:13:08 alex Exp $";
/**
* @file
@ -103,13 +103,13 @@ COMMAND My_Commands[] =
};
LOCAL void Init_Request PARAMS(( REQUEST *Req ));
static void Init_Request PARAMS(( REQUEST *Req ));
LOCAL bool Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
LOCAL bool Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
LOCAL bool Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
static bool Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
static bool Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
static bool Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
LOCAL bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
/**
@ -247,7 +247,7 @@ Parse_Request( CONN_ID Idx, char *Request )
* Initialize request structure.
* @param Req Request structure to be initialized.
*/
LOCAL void
static void
Init_Request( REQUEST *Req )
{
/* Neue Request-Struktur initialisieren */
@ -263,7 +263,7 @@ Init_Request( REQUEST *Req )
} /* Init_Request */
LOCAL bool
static bool
Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
{
CLIENT *client, *c;
@ -316,7 +316,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
} /* Validate_Prefix */
LOCAL bool
static bool
Validate_Command( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
{
assert( Idx >= 0 );
@ -327,7 +327,7 @@ Validate_Command( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
} /* Validate_Comman */
LOCAL bool
static bool
Validate_Args( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
{
assert( Idx >= 0 );
@ -338,7 +338,7 @@ Validate_Args( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
} /* Validate_Args */
LOCAL bool
static bool
Handle_Request( CONN_ID Idx, REQUEST *Req )
{
/* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler

20
src/ngircd/rendezvous.c
View File

@ -21,7 +21,7 @@
#ifdef ZEROCONF
static char UNUSED id[] = "$Id: rendezvous.c,v 1.6 2005/07/08 16:18:39 alex Exp $";
static char UNUSED id[] = "$Id: rendezvous.c,v 1.7 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -72,10 +72,10 @@ typedef struct _service
#endif
} SERVICE;
LOCAL SERVICE My_Rendezvous[MAX_RENDEZVOUS];
static SERVICE My_Rendezvous[MAX_RENDEZVOUS];
LOCAL void Unregister( int Idx );
static void Unregister( int Idx );
/* -- Apple API -- */
@ -84,7 +84,7 @@ LOCAL void Unregister( int Idx );
#define MAX_MACH_MSG_SIZE 512
LOCAL void Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrCode, void *Context );
static void Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrCode, void *Context );
#endif /* Apple */
@ -93,10 +93,10 @@ LOCAL void Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrC
#ifdef HOWL
LOCAL sw_discovery My_Discovery_Session = NULL;
LOCAL sw_salt My_Salt;
static sw_discovery My_Discovery_Session = NULL;
static sw_salt My_Salt;
LOCAL sw_result HOWL_API Registration_Reply_Handler( sw_discovery Session, sw_discovery_publish_status Status, sw_discovery_oid Id, sw_opaque Extra );
static sw_result HOWL_API Registration_Reply_Handler( sw_discovery Session, sw_discovery_publish_status Status, sw_discovery_oid Id, sw_opaque Extra );
#endif /* Howl */
@ -263,7 +263,7 @@ GLOBAL void Rendezvous_Handler( void )
} /* Rendezvous_Handler */
LOCAL void Unregister( int Idx )
static void Unregister( int Idx )
{
/* Unregister service */
@ -289,7 +289,7 @@ LOCAL void Unregister( int Idx )
#ifdef APPLE
LOCAL void Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrCode, void *Context )
static void Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrCode, void *Context )
{
SERVICE *s = (SERVICE *)Context;
char txt[50];
@ -326,7 +326,7 @@ LOCAL void Registration_Reply_Handler( DNSServiceRegistrationReplyErrorType ErrC
#ifdef HOWL
LOCAL sw_result HOWL_API Registration_Reply_Handler( sw_discovery Session, sw_discovery_publish_status Status, UNUSED sw_discovery_oid Id, sw_opaque Extra )
static sw_result HOWL_API Registration_Reply_Handler( sw_discovery Session, sw_discovery_publish_status Status, UNUSED sw_discovery_oid Id, sw_opaque Extra )
{
SERVICE *s = (SERVICE *)Extra;
char txt[50];

22
src/ngircd/resolve.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: resolve.c,v 1.16 2005/07/28 16:13:09 fw Exp $";
static char UNUSED id[] = "$Id: resolve.c,v 1.17 2005/07/31 20:13:08 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -43,18 +43,18 @@ static char UNUSED id[] = "$Id: resolve.c,v 1.16 2005/07/28 16:13:09 fw Exp $";
#ifdef IDENTAUTH
LOCAL void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int Sock, int w_fd ));
static void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int Sock, int w_fd ));
#else
LOCAL void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int w_fd ));
static void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int w_fd ));
#endif
LOCAL void Do_ResolveName PARAMS(( char *Host, int w_fd ));
static void Do_ResolveName PARAMS(( char *Host, int w_fd ));
#ifdef h_errno
LOCAL char *Get_Error PARAMS(( int H_Error ));
static char *Get_Error PARAMS(( int H_Error ));
#endif
LOCAL RES_STAT *New_Res_Stat PARAMS(( void ));
static RES_STAT *New_Res_Stat PARAMS(( void ));
static void
@ -174,10 +174,10 @@ out: /* Error! */
#ifdef IDENTAUTH
LOCAL void
static void
Do_ResolveAddr( struct sockaddr_in *Addr, int Sock, int w_fd )
#else
LOCAL void
static void
Do_ResolveAddr( struct sockaddr_in *Addr, int w_fd )
#endif
{
@ -261,7 +261,7 @@ Do_ResolveAddr( struct sockaddr_in *Addr, int w_fd )
} /* Do_ResolveAddr */
LOCAL void
static void
Do_ResolveName( char *Host, int w_fd )
{
/* Resolver sub-process: resolve name and write result into pipe
@ -305,7 +305,7 @@ Do_ResolveName( char *Host, int w_fd )
#ifdef h_errno
LOCAL char *
static char *
Get_Error( int H_Error )
{
/* Get error message for H_Error */
@ -328,7 +328,7 @@ Get_Error( int H_Error )
#endif
LOCAL RES_STAT *
static RES_STAT *
New_Res_Stat( void )
{
RES_STAT *s;

5
src/portab/portab.h
View File

@ -8,7 +8,7 @@
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
*
* $Id: portab.h,v 1.21 2005/04/16 09:23:01 fw Exp $
* $Id: portab.h,v 1.22 2005/07/31 20:13:11 alex Exp $
*
* Portability functions and declarations (header for libngbportab).
*/
@ -65,9 +65,6 @@
#endif
/* keywords */
#define LOCAL static
/* datatypes */
#ifndef PROTOTYPES

6
src/portab/portabtest.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: portabtest.c,v 1.12 2005/03/19 18:43:50 fw Exp $";
static char UNUSED id[] = "$Id: portabtest.c,v 1.13 2005/07/31 20:13:11 alex Exp $";
#include "imp.h"
#include <stdarg.h>
@ -25,7 +25,7 @@ static char UNUSED id[] = "$Id: portabtest.c,v 1.12 2005/03/19 18:43:50 fw Exp $
#include "exp.h"
LOCAL void Panic PARAMS (( char *Reason, int Code ));
static void Panic PARAMS (( char *Reason, int Code ));
GLOBAL int
@ -51,7 +51,7 @@ main( void )
} /* portab_check_types */
LOCAL void
static void
Panic( char *Reason, int Code )
{
/* Oops, something failed!? */