sas Sat Nov 30 22:59:48 2002 EDT
Modified files:
/php4/ext/ircg ircg.c
Log:
move back initialization of the write buffer to the original place,
so that the condition "fd>=0" can be equated to "wb is initialized"
again.
Index: php4/ext/ircg/ircg.c
diff -u php4/ext/ircg/ircg.c:1.144 php4/ext/ircg/ircg.c:1.145
--- php4/ext/ircg/ircg.c:1.144 Sat Nov 30 22:47:49 2002
+++ php4/ext/ircg/ircg.c Sat Nov 30 22:59:48 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg.c,v 1.144 2002/12/01 03:47:49 sas Exp $ */
+/* $Id: ircg.c,v 1.145 2002/12/01 03:59:48 sas Exp $ */
/* {{{ includes */
@@ -1579,6 +1579,7 @@
sizeof(int), NULL);
#endif
if (conn->file_fd == -1 && conn->fd >= 0) {
+ irc_write_buf_add(&conn->wb, conn->fd);
IRCGG(flush_data) = conn;
}
RETVAL_TRUE;
@@ -2211,9 +2212,9 @@
* conn must be able to live longer than the hash entry in h_irconn,
* so we have to allocate it ourselves.
*/
- conn = IRCG_SHARED_ALLOC(sizeof(*conn));
+ conn = IRCG_SHARED_ALLOC(sizeof *conn);
+ memset(conn, 0, sizeof *conn);
conn->fd = conn->file_fd = -1;
- conn->ident = conn->password = conn->realname = NULL;
if (ZEND_NUM_ARGS() > 5 && Z_TYPE_PP(p6) == IS_ARRAY) {
zval **val;
@@ -2236,9 +2237,6 @@
}
}
-#ifdef IRCG_PENDING_URL
- conn->od_port = 0;
-#endif
conn->fmt_msgs = fmt_msgs;
if (irc_connect(username, register_hooks,
conn, server, port, &conn->conn)) {
@@ -2250,7 +2248,6 @@
if (p5 && Z_TYPE_PP(p5) == IS_ARRAY) {
ircg_copy_ctcp_msgs(p5, conn);
}
- conn->password = conn->ident = NULL;
#ifdef USE_IRCONN_MANAGEMENT
if (irconn_id == 0)
@@ -2269,7 +2266,6 @@
conn->irconn_id = conn->conn.resid;
#endif
- conn->buffer.c = NULL;
conn->login = php_ircg_now();
if (conn->login >= next_gc)
@@ -2532,8 +2528,6 @@
{
if (IRCGG(flush_data)) {
php_irconn_t *conn = IRCGG(flush_data);
-
- irc_write_buf_add(&conn->wb, conn->fd);
#if IRCG_API_VERSION >= 20021127
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
