pajoye Tue Apr 28 08:33:25 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap php_imap.c
Log:
- space to tabs
- CS
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.48&r2=1.208.2.7.2.49&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.48
php-src/ext/imap/php_imap.c:1.208.2.7.2.49
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.48 Mon Apr 27 00:01:15 2009
+++ php-src/ext/imap/php_imap.c Tue Apr 28 08:33:25 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <z...@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.48 2009/04/27 00:01:15 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.49 2009/04/28 08:33:25 pajoye Exp $ */
#define IMAP41
@@ -275,7 +275,7 @@
*/
FOBJECTLIST *mail_newfolderobjectlist(void)
{
- return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)), 0,
sizeof(FOBJECTLIST));
+ return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)), 0,
sizeof(FOBJECTLIST));
}
/* }}} */
@@ -1150,11 +1150,11 @@
convert_to_long_ex(options);
flags = Z_LVAL_PP(options);
- /* Check that flags is exactly equal to PHP_EXPUNGE or Zero*/
- if (flags && ((flags & ~PHP_EXPUNGE) != 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
value for the flags parameter");
- RETURN_FALSE;
- }
+ /* Check that flags is exactly equal to PHP_EXPUNGE or Zero*/
+ if (flags && ((flags & ~PHP_EXPUNGE) != 0)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
value for the flags parameter");
+ RETURN_FALSE;
+ }
/* Do the translation from PHP's internal PHP_EXPUNGE define to
c-client's CL_EXPUNGE */
if (flags & PHP_EXPUNGE) {
@@ -1242,10 +1242,10 @@
if (myargc == 3) {
convert_to_long_ex(pflags);
flags = Z_LVAL_PP(pflags);
- if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"invalid value for the options parameter");
- RETURN_FALSE;
- }
+ if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
value for the options parameter");
+ RETURN_FALSE;
+ }
}
if ((myargc == 3) && (flags & FT_UID)) {
@@ -1881,10 +1881,10 @@
convert_to_long_ex(pflags);
flags = Z_LVAL_PP(pflags);
- if (flags && ((flags & ~FT_UID) != 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"invalid value for the options parameter");
- RETURN_FALSE;
- }
+ if (flags && ((flags & ~FT_UID) != 0)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
value for the options parameter");
+ RETURN_FALSE;
+ }
}
object_init(return_value);
@@ -1917,7 +1917,7 @@
zval **streamind, **msgno, **sec, **pflags;
pils *imap_le_struct;
char *body;
- long flags=0L;
+ long flags=0L;
unsigned long len;
int myargc=ZEND_NUM_ARGS();
@@ -1933,10 +1933,10 @@
if (myargc == 4) {
convert_to_long_ex(pflags);
flags = Z_LVAL_PP(pflags);
- if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"invalid value for the options parameter");
- RETURN_FALSE;
- }
+ if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
value for the options parameter");
+ RETURN_FALSE;
+ }
}
if (myargc < 4 || !(flags & FT_UID)) {
@@ -2690,7 +2690,7 @@
zval **streamind, **msgno, **pflags;
pils *imap_le_struct;
int msgindex, myargc = ZEND_NUM_ARGS();
- long flags=0L;
+ long flags=0L;
if (myargc < 2 || myargc > 3 || zend_get_parameters_ex(myargc,
&streamind, &msgno, &pflags) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
@@ -2701,12 +2701,12 @@
convert_to_long_ex(msgno);
if (myargc == 3) {
convert_to_long_ex(pflags);
- flags = Z_LVAL_PP(pflags);
- if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT))
!= 0)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"invalid value for the options parameter");
- RETURN_FALSE;
+ flags = Z_LVAL_PP(pflags);
+ if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT))
!= 0)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
value for the options parameter");
+ RETURN_FALSE;
}
- }
+ }
if ((myargc == 3) && (flags & FT_UID)) {
@@ -2950,9 +2950,9 @@
if(myargc == 3) {
convert_to_long_ex(pflags);
flags = Z_LVAL_PP(pflags);
- if (flags && ((flags & ~FT_UID) != 0)) {
+ if (flags && ((flags & ~FT_UID) != 0)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid
value for the options parameter");
- RETURN_FALSE;
+ RETURN_FALSE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
