- nicht unterstuetzte Channel-Modes entfernt.

[ngircd-alex.git] / src / ngircd / irc-write.c

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index e72cec9bb75e33cf800f954ae817aa9f6209dcca..5cc58006a115ad968efb4a04fbfd393ef306f785 100644 (file)
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -9,33 +9,41 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-write.c,v 1.1 2002/02/27 23:26:21 alex Exp $
+ * $Id: irc-write.c,v 1.5 2002/05/30 16:52:21 alex Exp $
  *
  * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden
- *
- * $Log: irc-write.c,v $
- * Revision 1.1  2002/02/27 23:26:21  alex
- * - Modul aus irc.c bzw. irc.h ausgegliedert.
- *
  */
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <exp.h>
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "defines.h"
+
+#include "exp.h"
 #include "irc-write.h"
 
 
-CHAR *Get_Prefix( CLIENT *Target, CLIENT *Client );
+LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
 
 
-GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrClient( Client, Format, va_alist )
+CLIENT *Client;
+CHAR *Format;
+va_dcl
+#endif
 {
        CHAR buffer[1000];
        BOOLEAN ok = CONNECTED;
@@ -44,7 +52,11 @@ GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... )
        assert( Client != NULL );
        assert( Format != NULL );
 
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
@@ -55,7 +67,17 @@ GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... )
 } /* IRC_WriteStrClient */
 
 
-GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrClientPrefix( Client, Prefix, Format, va_alist )
+CLIENT *Client;
+CLIENT *Prefix;
+CHAR *Format;
+va_dcl
+#endif
 {
        /* Text an Clients, lokal bzw. remote, senden. */
 
@@ -66,7 +88,11 @@ GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *F
        assert( Format != NULL );
        assert( Prefix != NULL );
 
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
@@ -74,7 +100,18 @@ GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *F
 } /* IRC_WriteStrClientPrefix */
 
 
-GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrChannel( Client, Chan, Remote, Format, va_alist )
+CLIENT *Client;
+CHANNEL *Chan;
+BOOLEAN Remote;
+CHAR *Format;
+va_dcl
+#endif
 {
        CHAR buffer[1000];
        va_list ap;
@@ -82,7 +119,11 @@ GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remot
        assert( Client != NULL );
        assert( Format != NULL );
 
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
@@ -90,7 +131,19 @@ GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remot
 } /* IRC_WriteStrChannel */
 
 
-GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrChannelPrefix( Client, Chan, Prefix, Remote, Format, va_alist )
+CLIENT *Client;
+CHANNEL *Chan;
+CLIENT *Prefix;
+BOOLEAN Remote;
+CHAR *Format;
+va_dcl
+#endif
 {
        BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
        CHAR buffer[1000];
@@ -104,7 +157,11 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT
        assert( Prefix != NULL );
        assert( Format != NULL );
 
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap  );
+#endif
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
@@ -150,23 +207,46 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT
 } /* IRC_WriteStrChannelPrefix */
 
 
-GLOBAL VOID IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL VOID
+IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... )
+#else
+GLOBAL VOID
+IRC_WriteStrServers( ExceptOf, Format, va_alist )
+CLIENT *ExceptOf;
+CHAR *Format;
+va_dcl
+#endif
 {
        CHAR buffer[1000];
        va_list ap;
 
        assert( Format != NULL );
 
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
        /* an den Client selber */
-       return IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), buffer );
+       IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), buffer );
 } /* IRC_WriteStrServers */
 
 
-GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL VOID
+IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... )
+#else
+GLOBAL VOID
+IRC_WriteStrServersPrefix( ExceptOf, Prefix, Format, va_alist )
+CLIENT *ExceptOf;
+CLIENT *Prefix;
+CHAR *Format;
+va_dcl
+#endif
 {
        CHAR buffer[1000];
        CLIENT *c;
@@ -175,7 +255,11 @@ GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *F
        assert( Format != NULL );
        assert( Prefix != NULL );
 
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
        
@@ -192,7 +276,18 @@ GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *F
 } /* IRC_WriteStrServersPrefix */
 
 
-GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL BOOLEAN
+IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
+#else
+GLOBAL BOOLEAN
+IRC_WriteStrRelatedPrefix( Client, Prefix, Remote, Format, va_alist )
+CLIENT *Client;
+CLIENT *Prefix;
+BOOLEAN Remote;
+CHAR *Format;
+va_dcl
+#endif
 {
        BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
        CL2CHAN *chan_cl2chan, *cl2chan;
@@ -206,7 +301,11 @@ GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEA
        assert( Prefix != NULL );
        assert( Format != NULL );
 
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
@@ -262,7 +361,8 @@ GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEA
 } /* IRC_WriteStrRelatedPrefix */
 
 
-CHAR *Get_Prefix( CLIENT *Target, CLIENT *Client )
+LOCAL CHAR *
+Get_Prefix( CLIENT *Target, CLIENT *Client )
 {
        assert( Target != NULL );
        assert( Client != NULL );