Made use of the resource macros here too. And some beutifying.

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 2d23ff90d63e645925726e98cfb9d3948c0141b2..3d3c30c637b46ff12eba7654daeca3c3d650b9d1 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -132,7 +132,7 @@ function_entry imap_functions[] = {
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
        PHP_FE(imap_get_quota,                                                  NULL)
        PHP_FE(imap_set_quota,                                                  NULL)
-       PHP_FE(imap_setacl,             NULL)
+       PHP_FE(imap_setacl,                                                             NULL)
 #endif
 
 #ifndef PHP_WIN32
@@ -1066,30 +1066,22 @@ PHP_FUNCTION(imap_set_quota)
 PHP_FUNCTION(imap_setacl)
 {
        zval **streamind, **mailbox, **id, **rights;
-       int ind, ind_type;
        pils *imap_le_struct;
-
+       
        if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &id, &rights) == FAILURE) {
                ZEND_WRONG_PARAM_COUNT();
        }
 
-       convert_to_long_ex(streamind);
+       ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
+
        convert_to_string_ex(mailbox);
-       convert_to_string_ex(id);
        convert_to_string_ex(rights);
 
-       ind = Z_LVAL_PP(streamind);
-       imap_le_struct = (pils *) zend_list_find(ind, &ind_type);
-       if (!imap_le_struct || !IS_STREAM(ind_type)) {
-               php_error(E_WARNING, "Unable to find stream pointer");
-               RETURN_FALSE;
-       }
-
        RETURN_LONG(imap_setacl(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), Z_STRVAL_PP(id), Z_STRVAL_PP(rights)));
 }
 /* }}} */
 
-#endif
+#endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
 
 
 /* {{{ proto int imap_expunge(int stream_id)