@@ -83,8 +83,8 @@ PHP_MINIT_FUNCTION(cyrus)
83
83
le_cyrus = zend_register_list_destructors_ex (cyrus_free , NULL ,
84
84
le_cyrus_name , module_number );
85
85
86
- REGISTER_LONG_CONSTANT ("CYRUS_CONN_NOSYNCLITERAL " ,
87
- IMCLIENT_CONN_NOSYNCLITERAL ,
86
+ REGISTER_LONG_CONSTANT ("CYRUS_CONN_NONSYNCLITERAL " ,
87
+ IMCLIENT_CONN_NONSYNCLITERAL ,
88
88
CONST_CS_ | CONST_PERSISTENT );
89
89
REGISTER_LONG_CONSTANT ("CYRUS_CONN_INITIALRESPONSE" ,
90
90
IMCLIENT_CONN_INITIALRESPONSE ,
@@ -266,13 +266,13 @@ PHP_FUNCTION(cyrus_authenticate)
266
266
}
267
267
else {
268
268
/* XXX: UGLY, but works, determines the username to use */
269
- user = sapi_getenv ("USER" , 4 );
269
+ user = ( char * ) sapi_getenv ("USER" , 4 );
270
270
if (! user ) {
271
- user = getenv ("USER" );
271
+ user = ( char * ) getenv ("USER" );
272
272
if (! user ) {
273
- user = sapi_getenv ("LOGNAME" , 7 );
273
+ user = ( char * ) sapi_getenv ("LOGNAME" , 7 );
274
274
if (! user ) {
275
- user = getenv ("LOGNAME" );
275
+ user = ( char * ) getenv ("LOGNAME" );
276
276
if (! user ) {
277
277
struct passwd * pwd = getpwuid (getuid ());
278
278
if (! pwd ) {
@@ -462,8 +462,7 @@ PHP_FUNCTION(cyrus_query)
462
462
ZEND_FETCH_RESOURCE (conn , php_cyrus * , z_conn , -1 , le_cyrus_name , le_cyrus );
463
463
convert_to_string_ex (query );
464
464
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 ));
467
466
468
467
RETURN_TRUE ;
469
468
}
0 commit comments