More spelling fixes

Remove superflous comments, mostly in German. Fix spelling and
use american variants for consistency.

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index d70cfb4e3b307bf7b13f2be2e3939aa0f4f5f543..09bd6fdeaee8400ae3e5c75ee539fb230a607a09 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -87,7 +87,7 @@ Client_Init( void )
                exit( 1 );
        }
 
                exit( 1 );
        }
 

-       /* Client-Struktur dieses Servers */
+       /* Client structure for this server */

        This_Server->next = NULL;
        This_Server->type = CLIENT_SERVER;
        This_Server->conn_id = NONE;
        This_Server->next = NULL;
        This_Server->type = CLIENT_SERVER;
        This_Server->conn_id = NONE;


@@ -515,7 +515,7 @@ GLOBAL bool
 Client_ModeAdd( CLIENT *Client, char Mode )
 {
        /* Set Mode.
 Client_ModeAdd( CLIENT *Client, char Mode )
 {
        /* Set Mode.

-        * If Client already alread had Mode, return false.
+        * If Client already had Mode, return false.

         * If the Mode was newly set, return true.
         */
 
         * If the Mode was newly set, return true.
         */
 


@@ -591,7 +591,7 @@ Client_Search( const char *Nick )
 
 
 /**
 
 
 /**

- * Serach first CLIENT structure matching a given mask of a server.
+ * Search first CLIENT structure matching a given mask of a server.

  *
  * The order of servers is arbitrary, but this function makes sure that the
  * local server is always returned if the mask matches it.
  *
  * The order of servers is arbitrary, but this function makes sure that the
  * local server is always returned if the mask matches it.


@@ -1341,8 +1341,6 @@ MyCount( CLIENT_TYPE Type )
 static CLIENT *
 New_Client_Struct( void )
 {
 static CLIENT *
 New_Client_Struct( void )
 {

-       /* Neue CLIENT-Struktur pre-initialisieren */
-

        CLIENT *c;
 
        c = (CLIENT *)malloc( sizeof( CLIENT ));
        CLIENT *c;
 
        c = (CLIENT *)malloc( sizeof( CLIENT ));


@@ -1377,7 +1375,7 @@ Generate_MyToken( CLIENT *Client )
        {
                if( c->mytoken == token )
                {
        {
                if( c->mytoken == token )
                {

-                       /* Das Token wurde bereits vergeben */
+                       /* The token is already in use */

                        token++;
                        c = My_Clients;
                        continue;
                        token++;
                        c = My_Clients;
                        continue;

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index bae5fa7ad7b8f96467eb200092d0a85440102d7a..d07878422af960fd99070b2ba1605507fc876e4b 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -317,7 +317,7 @@ opers_puts(void)
  * This function waits for a keypress of the user when stdin/stdout are valid
  * tty's ("you can read our nice message and we can read in your keypress").
  *
  * This function waits for a keypress of the user when stdin/stdout are valid
  * tty's ("you can read our nice message and we can read in your keypress").
  *

- * @return     0 on succes, 1 on failure(s); therefore the result code can
+ * @return     0 on success, 1 on failure(s); therefore the result code can

  *             directly be used by exit() when running "ngircd --configtest".
  */
 GLOBAL int
  *             directly be used by exit() when running "ngircd --configtest".
  */
 GLOBAL int


@@ -2281,7 +2281,7 @@ Conf_DebugDump(void)
 #endif
 
 /**
 #endif
 
 /**

- * Initialize server configuration structur to default values.
+ * Initialize server configuration structure to default values.

  *
  * @param Server       Pointer to server structure to initialize.
  */
  *
  * @param Server       Pointer to server structure to initialize.
  */

diff --git a/src/ngircd/conn-encoding.c b/src/ngircd/conn-encoding.c
index 71ab58848a5aa87d258f85156ab98021d5c0cd7a..98cd29a367047323d1633f57f2473443075215d9 100644 (file)
--- a/src/ngircd/conn-encoding.c
+++ b/src/ngircd/conn-encoding.c
@@ -123,7 +123,7 @@ Convert_Message(iconv_t Handle, char *Message)
        out_left = sizeof(Encoding_Buffer) - 1;
 
        if (iconv(Handle, &Message, &in_left, &out, &out_left) == (size_t)(-1)) {
        out_left = sizeof(Encoding_Buffer) - 1;
 
        if (iconv(Handle, &Message, &in_left, &out, &out_left) == (size_t)(-1)) {

-               /* An error occured! */
+               /* An error occurred! */

                LogDebug("Error converting message encoding!");
                strlcpy(Encoding_Buffer, Message, sizeof(Encoding_Buffer));
                iconv(Handle, NULL, NULL, NULL, NULL);
                LogDebug("Error converting message encoding!");
                strlcpy(Encoding_Buffer, Message, sizeof(Encoding_Buffer));
                iconv(Handle, NULL, NULL, NULL, NULL);

diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c
index 964767442ce8dfb1b3bc70ee443a4ceec8b6579c..b56e0f0742fb5298f5d53bac0583c40a52b02873 100644 (file)
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -137,8 +137,6 @@ Conn_Flag( CONN_ID Idx )
 GLOBAL void
 Conn_SetFlag( CONN_ID Idx, int Flag )
 {
 GLOBAL void
 Conn_SetFlag( CONN_ID Idx, int Flag )
 {

-       /* Connection markieren */
-

        assert( Idx > NONE );
        My_Connections[Idx].flag = Flag;
 } /* Conn_SetFlag */
        assert( Idx > NONE );
        My_Connections[Idx].flag = Flag;
 } /* Conn_SetFlag */


@@ -147,9 +145,6 @@ Conn_SetFlag( CONN_ID Idx, int Flag )
 GLOBAL CONN_ID
 Conn_First( void )
 {
 GLOBAL CONN_ID
 Conn_First( void )
 {

-       /* Connection-Struktur der ersten Verbindung liefern;
-        * Ist keine Verbindung vorhanden, wird NONE geliefert. */
-

        CONN_ID i;
        
        for( i = 0; i < Pool_Size; i++ )
        CONN_ID i;
        
        for( i = 0; i < Pool_Size; i++ )


@@ -163,9 +158,6 @@ Conn_First( void )
 GLOBAL CONN_ID
 Conn_Next( CONN_ID Idx )
 {
 GLOBAL CONN_ID
 Conn_Next( CONN_ID Idx )
 {

-       /* Naechste Verbindungs-Struktur liefern; existiert keine
-        * weitere, so wird NONE geliefert. */
-

        CONN_ID i = NONE;
 
        assert( Idx > NONE );
        CONN_ID i = NONE;
 
        assert( Idx > NONE );

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 5967fd72535f4154d11bb92018c23e124b192e4d..01253a2a19dba746ead7a8edc8b1bca34985c263 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -128,7 +128,7 @@ time_t idle_t = 0;
  * Get number of sockets available from systemd(8).
  *
  * ngIRCd needs to implement its own sd_listen_fds(3) function and can't
  * Get number of sockets available from systemd(8).
  *
  * ngIRCd needs to implement its own sd_listen_fds(3) function and can't

- * use the one provided by systemd itself, becaus the sockets will be
+ * use the one provided by systemd itself, because the sockets will be

  * used in a forked child process with a new PID, and this would trigger
  * an error in the standard implementation.
  *
  * used in a forked child process with a new PID, and this would trigger
  * an error in the standard implementation.
  *


@@ -402,14 +402,13 @@ cb_clientserver_ssl(int sock, UNUSED short what)
 
 
 /**
 
 
 /**

- * Initialize connecion module.
+ * Initialize connection module.

  */
 GLOBAL void
 Conn_Init( void )
 {
        CONN_ID i;
 
  */
 GLOBAL void
 Conn_Init( void )
 {
        CONN_ID i;
 

-       /* Speicher fuer Verbindungs-Pool anfordern */

        Pool_Size = CONNECTION_POOL;
        if ((Conf_MaxConnections > 0) &&
                (Pool_Size > Conf_MaxConnections))
        Pool_Size = CONNECTION_POOL;
        if ((Conf_MaxConnections > 0) &&
                (Pool_Size > Conf_MaxConnections))


@@ -923,7 +922,7 @@ Conn_Handler(void)
                 * which is the granularity with witch we handle "penalty
                 * times" for example.
                 * Note: tv_sec/usec are undefined(!) after io_dispatch()
                 * which is the granularity with witch we handle "penalty
                 * times" for example.
                 * Note: tv_sec/usec are undefined(!) after io_dispatch()

-                * returns, so we have to set it beforce each call to it! */
+                * returns, so we have to set it before each call to it! */

                tv.tv_usec = 0;
                tv.tv_sec = 1;
 
                tv.tv_usec = 0;
                tv.tv_sec = 1;
 


@@ -1008,7 +1007,7 @@ va_dcl
                 *
                 * So we have a big problem here: we should send more bytes
                 * to the network than we are allowed to and we don't know
                 *
                 * So we have a big problem here: we should send more bytes
                 * to the network than we are allowed to and we don't know

-                * the originator (any more). The "old" behaviour of blaming
+                * the originator (any more). The "old" behavior of blaming

                 * the receiver ("next hop") is a bad idea (it could be just
                 * an other server only routing the message!), so the only
                 * option left is to shorten the string and to hope that the
                 * the receiver ("next hop") is a bad idea (it could be just
                 * an other server only routing the message!), so the only
                 * option left is to shorten the string and to hope that the


@@ -1709,7 +1708,7 @@ Socket2Index( int Sock )
 
 
 /**
 
 
 /**

- * Read data from the network to the read buffer. If an error occures,
+ * Read data from the network to the read buffer. If an error occurs,

  * the socket of this connection will be shut down.
  *
  * @param Idx  Connection index.
  * the socket of this connection will be shut down.
  *
  * @param Idx  Connection index.


@@ -1858,7 +1857,7 @@ Handle_Buffer(CONN_ID Idx)
                maxcmd = (int)(Client_UserCount() / 5)
                       + MAX_COMMANDS_SERVER_MIN;
                /* Allow servers to handle even more commands while peering
                maxcmd = (int)(Client_UserCount() / 5)
                       + MAX_COMMANDS_SERVER_MIN;
                /* Allow servers to handle even more commands while peering

-                * to speed up server login and network synchronisation. */
+                * to speed up server login and network synchronization. */

                if (Conn_LastPing(Idx) == 0)
                        maxcmd *= 5;
                break;
                if (Conn_LastPing(Idx) == 0)
                        maxcmd *= 5;
                break;


@@ -2352,7 +2351,7 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 
 /**
  * Read results of a resolver sub-process from the pipe and update the
 
 /**
  * Read results of a resolver sub-process from the pipe and update the

- * apropriate connection/client structure(s): hostname and/or IDENT user name.
+ * appropriate connection/client structure(s): hostname and/or IDENT user name.

  *
  * @param r_fd         File descriptor of the pipe to the sub-process.
  * @param events       (ignored IO specification)
  *
  * @param r_fd         File descriptor of the pipe to the sub-process.
  * @param events       (ignored IO specification)


@@ -2579,7 +2578,7 @@ Conn_SetAuthPing(CONN_ID Idx, long ID)
 #ifdef SSL_SUPPORT
 
 /**
 #ifdef SSL_SUPPORT
 
 /**

- * Get information about used SSL chiper.
+ * Get information about used SSL cipher.

  *
  * @param Idx  Connection index number.
  * @param buf  Buffer for returned information text.
  *
  * @param Idx  Connection index number.
  * @param buf  Buffer for returned information text.

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index c683640149cd9b618340d4871d69ed35fcac8632..5e20deed423feef61343bf4524e09de2054d7219 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -175,7 +175,7 @@ join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags)
 /**
  * Forward JOIN command to a specific server
  *
 /**
  * Forward JOIN command to a specific server
  *

- * This function diffentiates between servers using RFC 2813 mode that
+ * This function differentiates between servers using RFC 2813 mode that

  * support the JOIN command with appended ASCII 7 character and channel
  * modes, and servers using RFC 1459 protocol which require separate JOIN
  * and MODE commands.
  * support the JOIN command with appended ASCII 7 character and channel
  * modes, and servers using RFC 1459 protocol which require separate JOIN
  * and MODE commands.


@@ -253,7 +253,7 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan,
 } /* join_forward */
 
 /**
 } /* join_forward */
 
 /**

- * Aknowledge user JOIN request and send "channel info" numerics.
+ * Acknowledge user JOIN request and send "channel info" numerics.

  *
  * @param Client       Client used to prefix the genrated commands
  * @param target       Forward commands/numerics to this user
  *
  * @param Client       Client used to prefix the genrated commands
  * @param target       Forward commands/numerics to this user


@@ -495,7 +495,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
                                          Client_ID(from), Req->argv[0]);
 
        /* Only remote servers and channel members are allowed to change the
                                          Client_ID(from), Req->argv[0]);
 
        /* Only remote servers and channel members are allowed to change the

-        * channel topic, and IRC opreators when the Conf_OperCanMode option
+        * channel topic, and IRC operators when the Conf_OperCanMode option

         * is set in the server configuration. */
        if (Client_Type(Client) != CLIENT_SERVER) {
                topic_power = Client_HasMode(from, 'o');
         * is set in the server configuration. */
        if (Client_Type(Client) != CLIENT_SERVER) {
                topic_power = Client_HasMode(from, 'o');


@@ -745,7 +745,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
                }
        }
 
                }
        }
 

-       /* Forward CHANINFO to other serevrs */
+       /* Forward CHANINFO to other servers */

        if (Req->argc == 5)
                IRC_WriteStrServersPrefixFlag(Client, from, 'C',
                                              "CHANINFO %s %s %s %s :%s",
        if (Req->argc == 5)
                IRC_WriteStrServersPrefixFlag(Client, from, 'C',
                                              "CHANINFO %s %s %s %s :%s",

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 3769beff78124b2f65ac28ffbf09b1ca27dc246f..d05ce24c0934e2b55075aca07af9d8c1cd5a22e5 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1404,7 +1404,7 @@ IRC_Send_LUSERS(CLIENT *Client)
 
        assert(Client != NULL);
 
 
        assert(Client != NULL);
 

-       /* Users, services and serevers in the network */
+       /* Users, services and servers in the network */

        if (!IRC_WriteStrClient(Client, RPL_LUSERCLIENT_MSG, Client_ID(Client),
                                Client_UserCount(), Client_ServiceCount(),
                                Client_ServerCount()))
        if (!IRC_WriteStrClient(Client, RPL_LUSERCLIENT_MSG, Client_ID(Client),
                                Client_UserCount(), Client_ServiceCount(),
                                Client_ServerCount()))

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index cfb94f60926f08b3dd9410e0d1f265958a52c9a9..1915a6d75a6d8f6b0edb622a8ac4ef282818e145 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -544,7 +544,7 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req)
        /* Validate service name ("nickname") */
        c = Client_Search(nick);
        if(c) {
        /* Validate service name ("nickname") */
        c = Client_Search(nick);
        if(c) {

-               /* Nickname collission: disconnect (KILL) both clients! */
+               /* Nickname collision: disconnect (KILL) both clients! */

                Log(LOG_ERR, "Server %s introduces already registered service \"%s\"!",
                    Client_ID(Client), nick);
                Kill_Nick(nick, "Nick collision");
                Log(LOG_ERR, "Server %s introduces already registered service \"%s\"!",
                    Client_ID(Client), nick);
                Kill_Nick(nick, "Nick collision");

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index a51369f0086f189fba6f2ebf8a90db65a0f1ef26..cebddd22ef551dff43366b06f0ba50e0e38ff577 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -54,7 +54,7 @@ static bool Send_ListChange PARAMS((const bool IsAdd, const char ModeChar,
  * Handler for the IRC "MODE" command.
  *
  * This function detects whether user or channel modes should be modified
  * Handler for the IRC "MODE" command.
  *
  * This function detects whether user or channel modes should be modified

- * and calls the apropriate sub-functions.
+ * and calls the appropriate sub-functions.

  *
  * @param Client The client from which this command has been received.
  * @param Req Request structure with prefix and all parameters.
  *
  * @param Client The client from which this command has been received.
  * @param Req Request structure with prefix and all parameters.


@@ -354,7 +354,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                }
 
                if (send_RPL_HOSTHIDDEN_MSG && Client_Conn(Target) > NONE) {
                }
 
                if (send_RPL_HOSTHIDDEN_MSG && Client_Conn(Target) > NONE) {

-                       /* A new (cloaked) hostname must be annoucned */
+                       /* A new (cloaked) hostname must be announced */

                        IRC_WriteStrClientPrefix(Target, Origin,
                                                 RPL_HOSTHIDDEN_MSG,
                                                 Client_ID(Target),
                        IRC_WriteStrClientPrefix(Target, Origin,
                                                 RPL_HOSTHIDDEN_MSG,
                                                 Client_ID(Target),


@@ -1035,7 +1035,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel,
 }
 
 /**
 }
 
 /**

- * Delete entries from channel invite, ban and exeption lists.
+ * Delete entries from channel invite, ban and exception lists.

  *
  * @param what Can be 'I' for invite, 'b' for ban, and 'e' for exception list.
  * @param Prefix The originator of the command.
  *
  * @param what Can be 'I' for invite, 'b' for ban, and 'e' for exception list.
  * @param Prefix The originator of the command.

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index d8e4b29ace707d26583a00e8c828c77d002887ce..7770be856cb0840aee2464633d1bd60344fb5e16 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -82,7 +82,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                        if (strcasecmp(Req->argv[0], Conf_Server[i].name) == 0)
                                break;
 
                        if (strcasecmp(Req->argv[0], Conf_Server[i].name) == 0)
                                break;
 

-               /* Makre sure the remote server is configured here */
+               /* Make sure the remote server is configured here */

                if (i >= MAX_SERVERS) {
                        Log(LOG_ERR,
                            "Connection %d: Server \"%s\" not configured here!",
                if (i >= MAX_SERVERS) {
                        Log(LOG_ERR,
                            "Connection %d: Server \"%s\" not configured here!",

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index fd0f85a7151f749432e98aff2271e2417f992248..ea9b9a02836a0c8f5c617c6cf6f5b2f7c2a5ff79 100644 (file)
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -321,7 +321,7 @@ IRC_WriteStrServersPrefixFlag_CB(CLIENT *ExceptOf, CLIENT *Prefix, char Flag,
 
 /**
  * send message to all clients that are in the same channels as the client sending this message.
 
 /**
  * send message to all clients that are in the same channels as the client sending this message.

- * only send message once per reote server.
+ * only send message once per remote server.

  */
 #ifdef PROTOTYPES
 GLOBAL bool
  */
 #ifdef PROTOTYPES
 GLOBAL bool

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index dbce773b72810972a1f67f50a9f3a68eeda75115..ddef7d021ac3d8b03891062933408df4b0f2cae0 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -111,7 +111,7 @@ IRC_ERROR(CLIENT *Client, REQUEST *Req)
 /**
  * Handler for the IRC "KILL" command.
  *
 /**
  * Handler for the IRC "KILL" command.
  *

- * This function implements the IRC command "KILL" wich is used to selectively
+ * This function implements the IRC command "KILL" which is used to selectively

  * disconnect clients. It can be used by IRC operators and servers, for example
  * to "solve" nick collisions after netsplits. See RFC 2812 section 3.7.1.
  *
  * disconnect clients. It can be used by IRC operators and servers, for example
  * to "solve" nick collisions after netsplits. See RFC 2812 section 3.7.1.
  *

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index e5bed7912f28401ab93884ee5e84ad4c0c5f7465..028f43532c7cb8778ad80ca3c3a58d795d533452 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -160,7 +160,7 @@ va_dcl
  * suitable for the mode ngIRCd is running in (daemon vs. non-daemon).
  * If LOG_snotice is set, the log messages goes to all user with the mode +s
  * set and the local &SERVER channel, too.
  * suitable for the mode ngIRCd is running in (daemon vs. non-daemon).
  * If LOG_snotice is set, the log messages goes to all user with the mode +s
  * set and the local &SERVER channel, too.

- * Please note: you sould use LogDebug(...) for debug messages!
+ * Please note: you should use LogDebug(...) for debug messages!

  * @param Level syslog level (LOG_xxx)
  * @param Format Format string like printf().
  * @param ... Further arguments.
  * @param Level syslog level (LOG_xxx)
  * @param Format Format string like printf().
  * @param ... Further arguments.

diff --git a/src/ngircd/login.c b/src/ngircd/login.c
index d8c8c40a2d6c0d0bf9f510c8299cf8f11c160d6b..bbde6359d70434748779ba96a8868134a8e1aa19 100644 (file)
--- a/src/ngircd/login.c
+++ b/src/ngircd/login.c
@@ -90,7 +90,7 @@ Login_User(CLIENT * Client)
 #ifdef PAM
        if (!Conf_PAM) {
                /* Don't do any PAM authentication at all, instead emulate
 #ifdef PAM
        if (!Conf_PAM) {
                /* Don't do any PAM authentication at all, instead emulate

-                * the beahiour of the daemon compiled without PAM support:
+                * the behavior of the daemon compiled without PAM support:

                 * because there can't be any "server password", all
                 * passwords supplied are classified as "wrong". */
                if(Conn_Password(conn)[0] == '\0')
                 * because there can't be any "server password", all
                 * passwords supplied are classified as "wrong". */
                if(Conn_Password(conn)[0] == '\0')


@@ -194,7 +194,7 @@ Login_User_PostAuth(CLIENT *Client)
 #ifdef PAM
 
 /**
 #ifdef PAM
 
 /**

- * Read result of the authenticatior sub-process from pipe
+ * Read result of the authenticator sub-process from pipe

  *
  * @param r_fd         File descriptor of the pipe.
  * @param events       (ignored IO specification)
  *
  * @param r_fd         File descriptor of the pipe.
  * @param events       (ignored IO specification)

diff --git a/src/ngircd/match.c b/src/ngircd/match.c
index 75bf4358395d27fa21b8a9c213c307a82a2196d6..dad3e7bc455ac901c6879e3811a361c97cbeed85 100644 (file)
--- a/src/ngircd/match.c
+++ b/src/ngircd/match.c
@@ -55,7 +55,6 @@ static int Matche_After_Star PARAMS(( const char *p, const char *t ));
 GLOBAL bool
 Match( const char *Pattern, const char *String )
 {
 GLOBAL bool
 Match( const char *Pattern, const char *String )
 {

-       /* Pattern mit String vergleichen */

        if( Matche( Pattern, String ) == MATCH_VALID ) return true;
        else return false;
 } /* Match */
        if( Matche( Pattern, String ) == MATCH_VALID ) return true;
        else return false;
 } /* Match */

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index e28c370b47af675ab000cf28bf9add9e0afc529d..e075e0a7355486c826497bd602cd64be7b1990ab 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -551,7 +551,7 @@ Pidfile_Create(pid_t pid)
 
 
 /**
 
 
 /**

- * Redirect stdin, stdout and stderr to apropriate file handles.
+ * Redirect stdin, stdout and stderr to appropriate file handles.

  *
  * @param fd   The file handle stdin, stdout and stderr should be redirected to.
  */
  *
  * @param fd   The file handle stdin, stdout and stderr should be redirected to.
  */

diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c
index 88872c47c5f841d9b008da5fdc59a39281f4f2bb..ed56497d77276f580d4607c9755348dfd8ae514f 100644 (file)
--- a/src/ngircd/pam.c
+++ b/src/ngircd/pam.c
@@ -15,7 +15,7 @@
 
 /**
  * @file
 
 /**
  * @file

- * PAM User Authentification
+ * PAM User Authentication

  */
 
 #include "imp.h"
  */
 
 #include "imp.h"

diff --git a/src/ngircd/pam.h b/src/ngircd/pam.h
index ba31d50abd893f9f8dea941df1311c9ae14bdee5..8c8e8f64e9c2462914e25c5fd43b7af07cfc5fd1 100644 (file)
--- a/src/ngircd/pam.h
+++ b/src/ngircd/pam.h
@@ -16,7 +16,7 @@
 
 /**
  * @file
 
 /**
  * @file

- * PAM User Authentification (header)
+ * PAM User Authentication (header)

  */
 
 GLOBAL bool PAM_Authenticate PARAMS((CLIENT *Client));
  */
 
 GLOBAL bool PAM_Authenticate PARAMS((CLIENT *Client));

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index 46164ce1515cb073ada9ffe92e75ade8d5cf207c..c92da4d2aa76b21d96bbc3dd9e2bd767c91b4190 100644 (file)
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -127,7 +127,7 @@ static COMMAND My_Commands[] =
        { "GET",  IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
        { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
 #endif
        { "GET",  IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
        { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
 #endif

-       { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
+       { NULL, NULL, 0x0, 0, 0, 0 } /* End-Mark */

 };
 
 static void Init_Request PARAMS(( REQUEST *Req ));
 };
 
 static void Init_Request PARAMS(( REQUEST *Req ));


@@ -157,7 +157,7 @@ Parse_GetCommandStruct( void )
  * Parse a command ("request") received from a client.
  * 
  * This function is called after the connection layer received a valid CR+LF
  * Parse a command ("request") received from a client.
  * 
  * This function is called after the connection layer received a valid CR+LF

- * terminated line of text: we asume that this is a valid IRC command and
+ * terminated line of text: we assume that this is a valid IRC command and

  * try to do something useful with it :-)
  *
  * All errors are reported to the client from which the command has been
  * try to do something useful with it :-)
  *
  * All errors are reported to the client from which the command has been


@@ -169,7 +169,7 @@ Parse_GetCommandStruct( void )
  * @param Idx Index of the connection from which the command has been received.
  * @param Request NULL terminated line of text (the "command").
  * @return true on success (valid command or "regular" error), false if a
  * @param Idx Index of the connection from which the command has been received.
  * @param Request NULL terminated line of text (the "command").
  * @return true on success (valid command or "regular" error), false if a

- *     fatal error occured and the connection has been shut down.
+ *     fatal error occurred and the connection has been shut down.

  */
 GLOBAL bool
 Parse_Request( CONN_ID Idx, char *Request )
  */
 GLOBAL bool
 Parse_Request( CONN_ID Idx, char *Request )


@@ -271,8 +271,6 @@ Parse_Request( CONN_ID Idx, char *Request )
 static void
 Init_Request( REQUEST *Req )
 {
 static void
 Init_Request( REQUEST *Req )
 {

-       /* Neue Request-Struktur initialisieren */
-

        int i;
 
        assert( Req != NULL );
        int i;
 
        assert( Req != NULL );


@@ -367,7 +365,7 @@ Validate_Command( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
        *Closed = false;
 
        return true;
        *Closed = false;
 
        return true;

-} /* Validate_Comman */
+} /* Validate_Command */

 
 
 static bool
 
 
 static bool

diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index 6d5ea8f83b9a97727727f39d0665e4be695cf241..effef44d8fb8b391e1b222eb2eaabee296632e48 100644 (file)
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -257,7 +257,7 @@ Signal_Callback(int fd, short UNUSED what)
 /**
  * Initialize the signal handlers, catch
  * those signals we are interested in and sets SIGPIPE to be ignored.
 /**
  * Initialize the signal handlers, catch
  * those signals we are interested in and sets SIGPIPE to be ignored.

- * @return true if initialization was sucessful.
+ * @return true if initialization was successful.

  */
 bool
 Signals_Init(void)
  */
 bool
 Signals_Init(void)


@@ -304,7 +304,7 @@ Signals_Init(void)
 } /* Signals_Init */
 
 /**
 } /* Signals_Init */
 
 /**

- * Restores signals to their default behaviour.
+ * Restores signals to their default behavior.

  *
  * This should be called after a fork() in the new
  * child prodcess, especially when we are about to call
  *
  * This should be called after a fork() in the new
  * child prodcess, especially when we are about to call