[PHP-CVS] cvs: php4 /ext/ircg ircg.c

[Sascha Schumann]

sas             Wed Jan 10 13:06:18 2001 EDT

  Modified files:              
    /php4/ext/ircg      ircg.c 
  Log:
  Improved handling for empty format strings
  
  Also kill a warning
  
  
Index: php4/ext/ircg/ircg.c
diff -u php4/ext/ircg/ircg.c:1.13 php4/ext/ircg/ircg.c:1.14
--- php4/ext/ircg/ircg.c:1.13   Wed Jan 10 11:07:23 2001
+++ php4/ext/ircg/ircg.c        Wed Jan 10 13:06:17 2001
@@ -35,7 +35,7 @@
 
 /* Format string numbers */
 enum {
-       FMT_MSG_CHAN,
+       FMT_MSG_CHAN = 0,
        FMT_MSG_PRIV_TO_ME,
        FMT_MSG_PRIV_FROM_ME,
        FMT_MSG_LEAVE,
@@ -221,6 +221,11 @@
        int mode = 0;
        smart_str new_msg = {0};
 
+       if (fmt[0] == '\0') {
+               result->len = 0;
+               return;
+       }
+
        if (msg) {
                mirc_color(msg, &new_msg);
        }
@@ -288,6 +293,8 @@
 
 static void msg_send(php_irconn_t *conn, smart_str *msg)
 {
+       if (msg->c == 0) return;
+
        if (conn->fd != -1) {
                int n;
 
@@ -534,7 +541,7 @@
 
        if (irc_connect(username, NULL, msg_handler, quit_handler, error_handler,
                        conn, server, port, &conn->conn)) {
-               free(conn->username);
+               free((char *) conn->username);
                free(conn);
                RETURN_FALSE;
        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]