diff options
| author | Sterling Hughes <sterling@php.net> | 2001-08-21 09:04:18 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2001-08-21 09:04:18 +0000 |
| commit | ee1eaf9fbb16d6d8207fec2ae92224351f16be3d (patch) | |
| tree | 86f6869cbff25111be0ab8e36983da60471551eb /ext/cyrus | |
| parent | bafecffb7ce9c5ecabd1f7b862b1e22ac7d09937 (diff) | |
| download | php-git-ee1eaf9fbb16d6d8207fec2ae92224351f16be3d.tar.gz | |
Update api and fix some compile warnings
Diffstat (limited to 'ext/cyrus')
| -rw-r--r-- | ext/cyrus/cyrus.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/cyrus/cyrus.c b/ext/cyrus/cyrus.c index b06fe9fa86..00b5daede9 100644 --- a/ext/cyrus/cyrus.c +++ b/ext/cyrus/cyrus.c @@ -83,8 +83,8 @@ PHP_MINIT_FUNCTION(cyrus) 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 @@ PHP_FUNCTION(cyrus_authenticate) } 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 @@ PHP_FUNCTION(cyrus_query) 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; } |