removed Conn_UnsetOption() function. It was not used anymore.

removed Conn_SetOption(). replaced its only call (in conn-zip.c) with Conn_OPTION_ADD() macro.

diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c
index 61516d68c6f34da4eb0f4d2065a1a40f30e77175..974c151a698e71a7b0f1ad68027f58497bd35eb8 100644 (file)
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn-func.c,v 1.4 2005/03/19 18:43:48 fw Exp $";
+static char UNUSED id[] = "$Id: conn-func.c,v 1.5 2005/04/25 18:37:16 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -149,31 +149,6 @@ Conn_Next( CONN_ID Idx )
 } /* Conn_Next */
 
 
-GLOBAL void
-Conn_SetOption( CONN_ID Idx, int Option )
-{
-       /* Option fuer Verbindung setzen.
-        * Initial sind alle Optionen _nicht_ gesetzt. */
-
-       assert( Idx > NONE );
-       assert( Option != 0 );
-
-       My_Connections[Idx].options |= Option;
-} /* Conn_SetOption */
-
-
-GLOBAL void
-Conn_UnsetOption( CONN_ID Idx, int Option )
-{
-       /* Option fuer Verbindung loeschen */
-
-       assert( Idx > NONE );
-       assert( Option != 0 );
-
-       My_Connections[Idx].options &= ~Option;
-} /* Conn_UnsetOption */
-
-
 GLOBAL int
 Conn_Options( CONN_ID Idx )
 {

diff --git a/src/ngircd/conn-func.h b/src/ngircd/conn-func.h
index 92c65bb5fe432c957f96a4c1e41f530f2c200a80..217ee3ec77767fde5849a1fa81da5a4e825d3e09 100644 (file)
--- a/src/ngircd/conn-func.h
+++ b/src/ngircd/conn-func.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn-func.h,v 1.3 2005/04/18 21:08:31 fw Exp $
+ * $Id: conn-func.h,v 1.4 2005/04/25 18:37:16 fw Exp $
  *
  * Connection management: Global functions (header)
  */
@@ -47,8 +47,6 @@ GLOBAL void Conn_SetFlag PARAMS(( CONN_ID Idx, int Flag ));
 GLOBAL CONN_ID Conn_First PARAMS(( void ));
 GLOBAL CONN_ID Conn_Next PARAMS(( CONN_ID Idx ));
 
-GLOBAL void Conn_SetOption PARAMS(( CONN_ID Idx, int Option ));
-GLOBAL void Conn_UnsetOption PARAMS(( CONN_ID Idx, int Option ));
 GLOBAL int Conn_Options PARAMS(( CONN_ID Idx ));
 
 GLOBAL void Conn_ResetWCounter PARAMS(( void ));

diff --git a/src/ngircd/conn-zip.c b/src/ngircd/conn-zip.c
index 6ed53d60c895368be8fbbb2c4b0f599f559075fa..5fb936ca87b4b95f4084bf92f6ef5ca3903c8c7a 100644 (file)
--- a/src/ngircd/conn-zip.c
+++ b/src/ngircd/conn-zip.c
@@ -19,7 +19,7 @@
 
 #ifdef ZLIB
 
-static char UNUSED id[] = "$Id: conn-zip.c,v 1.6 2005/03/19 18:43:48 fw Exp $";
+static char UNUSED id[] = "$Id: conn-zip.c,v 1.7 2005/04/25 18:37:16 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -72,7 +72,7 @@ Zip_InitConn( CONN_ID Idx )
        My_Connections[Idx].zip.bytes_out = My_Connections[Idx].bytes_out;
 
        Log( LOG_INFO, "Enabled link compression (zlib) on connection %d.", Idx );
-       Conn_SetOption( Idx, CONN_ZIP );
+       Conn_OPTION_ADD( &My_Connections[Idx], CONN_ZIP );
 
        return true;
 } /* Zip_InitConn */