cvs: php4 /ext/cyrus cyrus.c

sterling Tue Aug 21 05:04:19 2001 EDT Modified files: /php4/ext/cyrus cyrus.c Log: Update api and fix some compile warnings Index: php4/ext/cyrus/cyrus.c diff -u php4/ext/cyrus/cyrus.c:1.1 php4/ext/cyrus/cyrus.c:1.2 --- php4/ext/cyrus/cyrus.c:1.1 Sun Aug 5 13:43:03 2001 +++ php4/ext/cyrus/cyrus.c Tue Aug 21 05:04:18 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyrus.c,v 1.1 2001/08/05 17:43:03 sterling Exp $ */ +/* $Id: cyrus.c,v 1.2 2001/08/21 09:04:18 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,8 +83,8 @@ le_cyrus = zend_register_list_destructors_ex(cyrus_free, NULL, le_cyrus_name, module_number); - REGISTER_LONG_CONSTANT("CYRUS_CONN_NOSYNCLITERAL", - IMCLIENT_CONN_NOSYNCLITERAL, + REGISTER_LONG_CONSTANT("CYRUS_CONN_NONSYNCLITERAL", + IMCLIENT_CONN_NONSYNCLITERAL, CONST_CS_ | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CYRUS_CONN_INITIALRESPONSE", IMCLIENT_CONN_INITIALRESPONSE, @@ -266,13 +266,13 @@ } else { /* XXX: UGLY, but works, determines the username to use */ - user = sapi_getenv("USER", 4); + user = (char *) sapi_getenv("USER", 4); if (! user) { - user = getenv("USER"); + user = (char *) getenv("USER"); if (! user) { - user = sapi_getenv("LOGNAME", 7); + user = (char *) sapi_getenv("LOGNAME", 7); if (! user) { - user = getenv("LOGNAME"); + user = (char *) getenv("LOGNAME"); if (! user) { struct passwd *pwd = getpwuid(getuid()); if (! pwd) { @@ -462,8 +462,7 @@ ZEND_FETCH_RESOURCE(conn, php_cyrus *, z_conn, -1, le_cyrus_name, le_cyrus); convert_to_string_ex(query); - if (imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)) != 0) - RETURN_FALSE; + imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)); RETURN_TRUE; }