Skip to content

Commit ee1eaf9

Browse files
author
Sterling Hughes
committed
Update api and fix some compile warnings
1 parent bafecff commit ee1eaf9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

ext/cyrus/cyrus.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ PHP_MINIT_FUNCTION(cyrus)
8383
le_cyrus = zend_register_list_destructors_ex(cyrus_free, NULL,
8484
le_cyrus_name, module_number);
8585

86-
REGISTER_LONG_CONSTANT("CYRUS_CONN_NOSYNCLITERAL",
87-
IMCLIENT_CONN_NOSYNCLITERAL,
86+
REGISTER_LONG_CONSTANT("CYRUS_CONN_NONSYNCLITERAL",
87+
IMCLIENT_CONN_NONSYNCLITERAL,
8888
CONST_CS_ | CONST_PERSISTENT);
8989
REGISTER_LONG_CONSTANT("CYRUS_CONN_INITIALRESPONSE",
9090
IMCLIENT_CONN_INITIALRESPONSE,
@@ -266,13 +266,13 @@ PHP_FUNCTION(cyrus_authenticate)
266266
}
267267
else {
268268
/* XXX: UGLY, but works, determines the username to use */
269-
user = sapi_getenv("USER", 4);
269+
user = (char *) sapi_getenv("USER", 4);
270270
if (! user) {
271-
user = getenv("USER");
271+
user = (char *) getenv("USER");
272272
if (! user) {
273-
user = sapi_getenv("LOGNAME", 7);
273+
user = (char *) sapi_getenv("LOGNAME", 7);
274274
if (! user) {
275-
user = getenv("LOGNAME");
275+
user = (char *) getenv("LOGNAME");
276276
if (! user) {
277277
struct passwd *pwd = getpwuid(getuid());
278278
if (! pwd) {
@@ -462,8 +462,7 @@ PHP_FUNCTION(cyrus_query)
462462
ZEND_FETCH_RESOURCE(conn, php_cyrus *, z_conn, -1, le_cyrus_name, le_cyrus);
463463
convert_to_string_ex(query);
464464

465-
if (imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)) != 0)
466-
RETURN_FALSE;
465+
imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query));
467466

468467
RETURN_TRUE;
469468
}

0 commit comments

Comments
 (0)